Skip to content

Commit eff6243

Browse files
hmahmoodhmahmood
committed
Merge remote-tracking branch 'origin/main' into hasan.mahmood/add-cilium
2 parents c9a011b + 354a867 commit eff6243

File tree

9 files changed

+514
-60
lines changed

9 files changed

+514
-60
lines changed

‎Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ARG CI_UPLOADER_VERSION=2.30.1
1212
# Skip Pulumi update warning https://www.pulumi.com/docs/cli/environment-variables/
1313
ENV PULUMI_SKIP_UPDATE_CHECK=true
1414
# Always prevent installing dependencies dynamically
15-
ENV DEVA_NO_DYNAMIC_DEPS=1
15+
ENV DDA_NO_DYNAMIC_DEPS=1
1616

1717
# Install deps all in one step
1818
RUN apt-get update -y && \
@@ -125,9 +125,9 @@ RUN --mount=type=secret,id=github_token \
125125

126126
# Install Agent requirements, required to run invoke tests task
127127
# Remove AWS-related deps as we already install AWS CLI v2
128-
RUN DEVA_VERSION="$(curl -s https://raw.githubusercontent.com/DataDog/datadog-agent-buildimages/main/deva.env | awk -F= '/^DEVA_VERSION=/ {print $2}')" && \
129-
pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DEVA_VERSION}" && \
130-
deva -v self dep sync -f legacy-build -f legacy-e2e -f legacy-test-infra-definitions && \
128+
RUN DDA_VERSION="$(curl -s https://raw.githubusercontent.com/DataDog/datadog-agent-buildimages/main/dda.env | awk -F= '/^DDA_VERSION=/ {print $2}')" && \
129+
pip3 install "git+https://github.com/DataDog/datadog-agent-dev.git@${DDA_VERSION}" && \
130+
dda -v self dep sync -f legacy-build -f legacy-e2e -f legacy-test-infra-definitions && \
131131
go install gotest.tools/gotestsum@latest
132132

133133
# Install Orchestrion for native Go Test Visibility support

‎components/datadog/agent/kubernetes_helm.go

+3
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,9 @@ func buildLinuxHelmValues(baseName, agentImagePath, agentImageTag, clusterAgentI
508508
},
509509
},
510510
},
511+
"tags": []string{
512+
"kube_instance_tag:static",
513+
},
511514
},
512515
},
513516
})),

‎components/kubernetes/kind.go

+19-15
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,12 @@ func NewKindClusterWithConfig(env config.Env, vm *remote.Host, name string, kube
4848
}
4949
opts = utils.MergeOptions(opts, utils.PulumiDependsOn(dockerManager, curlCommand))
5050

51-
kindVersionConfig, err := getKindVersionConfig(kubeVersion)
51+
kindVersionConfig, err := GetKindVersionConfig(kubeVersion)
5252
if err != nil {
5353
return err
5454
}
5555

56-
kindArch := vm.OS.Descriptor().Architecture
57-
if kindArch == os.AMD64Arch {
58-
kindArch = "amd64"
59-
}
60-
kindInstall, err := runner.Command(
61-
commonEnvironment.CommonNamer().ResourceName("kind-install"),
62-
&command.Args{
63-
Create: pulumi.Sprintf(`curl --retry 10 -fsSLo ./kind "https://kind.sigs.k8s.io/dl/%s/kind-linux-%s" && sudo install kind /usr/local/bin/kind`, kindVersionConfig.kindVersion, kindArch),
64-
},
65-
opts...,
66-
)
56+
kindInstall, err := InstallKindBinary(env, vm, kindVersionConfig.KindVersion, opts...)
6757
if err != nil {
6858
return err
6959
}
@@ -76,7 +66,7 @@ func NewKindClusterWithConfig(env config.Env, vm *remote.Host, name string, kube
7666
return err
7767
}
7868

79-
nodeImage := fmt.Sprintf("%s/%s:%s", env.InternalDockerhubMirror(), kindNodeImageName, kindVersionConfig.nodeImageVersion)
69+
nodeImage := fmt.Sprintf("%s/%s:%s", env.InternalDockerhubMirror(), kindNodeImageName, kindVersionConfig.NodeImageVersion)
8070
createCluster, err := runner.Command(
8171
commonEnvironment.CommonNamer().ResourceName("kind-create-cluster"),
8272
&command.Args{
@@ -119,7 +109,7 @@ func NewLocalKindCluster(env config.Env, name string, kubeVersion string, opts .
119109
opts = utils.MergeOptions[pulumi.ResourceOption](opts, pulumi.Parent(clusterComp))
120110
commonEnvironment := env
121111

122-
kindVersionConfig, err := getKindVersionConfig(kubeVersion)
112+
kindVersionConfig, err := GetKindVersionConfig(kubeVersion)
123113
if err != nil {
124114
return err
125115
}
@@ -139,7 +129,7 @@ func NewLocalKindCluster(env config.Env, name string, kubeVersion string, opts .
139129
return err
140130
}
141131

142-
nodeImage := fmt.Sprintf("%s/%s:%s", env.InternalDockerhubMirror(), kindNodeImageName, kindVersionConfig.nodeImageVersion)
132+
nodeImage := fmt.Sprintf("%s/%s:%s", env.InternalDockerhubMirror(), kindNodeImageName, kindVersionConfig.NodeImageVersion)
143133
createCluster, err := runner.Command(
144134
commonEnvironment.CommonNamer().ResourceName("kind-create-cluster"),
145135
&command.Args{
@@ -170,3 +160,17 @@ func NewLocalKindCluster(env config.Env, name string, kubeVersion string, opts .
170160
return nil
171161
}, opts...)
172162
}
163+
164+
func InstallKindBinary(env config.Env, vm *remote.Host, kindVersion string, opts ...pulumi.ResourceOption) (pulumi.Resource, error) {
165+
kindArch := vm.OS.Descriptor().Architecture
166+
if kindArch == os.AMD64Arch {
167+
kindArch = "amd64"
168+
}
169+
return vm.OS.Runner().Command(
170+
env.CommonNamer().ResourceName("kind-install"),
171+
&command.Args{
172+
Create: pulumi.Sprintf(`curl --retry 10 -fsSLo ./kind "https://kind.sigs.k8s.io/dl/%s/kind-linux-%s" && sudo install kind /usr/local/bin/kind`, kindVersion, kindArch),
173+
},
174+
opts...,
175+
)
176+
}

‎components/kubernetes/kind_versions.go

+41-40
Original file line numberDiff line numberDiff line change
@@ -7,86 +7,87 @@ import (
77
"github.com/Masterminds/semver"
88
)
99

10-
type kindConfig struct {
11-
kindVersion string
12-
nodeImageVersion string
10+
// KindConfig contains the kind version and the kind node image to use
11+
type KindConfig struct {
12+
KindVersion string
13+
NodeImageVersion string
1314
}
1415

1516
// Source: https://github.com/kubernetes-sigs/kind/releases
16-
var kubeToKindVersion = map[string]kindConfig{
17+
var kubeToKindVersion = map[string]KindConfig{
1718
"1.32": {
18-
kindVersion: "v0.26.0",
19-
nodeImageVersion: "v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027",
19+
KindVersion: "v0.26.0",
20+
NodeImageVersion: "v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027",
2021
},
2122
"1.31": {
22-
kindVersion: "v0.26.0",
23-
nodeImageVersion: "v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30",
23+
KindVersion: "v0.26.0",
24+
NodeImageVersion: "v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30",
2425
},
2526
"1.30": {
26-
kindVersion: "v0.26.0",
27-
nodeImageVersion: "v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf",
27+
KindVersion: "v0.26.0",
28+
NodeImageVersion: "v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf",
2829
},
2930
"1.29": {
30-
kindVersion: "v0.22.0",
31-
nodeImageVersion: "v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245",
31+
KindVersion: "v0.22.0",
32+
NodeImageVersion: "v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245",
3233
},
3334
"1.28": {
34-
kindVersion: "v0.22.0",
35-
nodeImageVersion: "v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58",
35+
KindVersion: "v0.22.0",
36+
NodeImageVersion: "v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58",
3637
},
3738
"1.27": {
38-
kindVersion: "v0.22.0",
39-
nodeImageVersion: "v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843",
39+
KindVersion: "v0.22.0",
40+
NodeImageVersion: "v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843",
4041
},
4142
"1.26": {
42-
kindVersion: "v0.22.0",
43-
nodeImageVersion: "v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f",
43+
KindVersion: "v0.22.0",
44+
NodeImageVersion: "v1.26.14@sha256:5d548739ddef37b9318c70cb977f57bf3e5015e4552be4e27e57280a8cbb8e4f",
4445
},
4546
"1.25": {
46-
kindVersion: "v0.22.0",
47-
nodeImageVersion: "v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519",
47+
KindVersion: "v0.22.0",
48+
NodeImageVersion: "v1.25.16@sha256:e8b50f8e06b44bb65a93678a65a26248fae585b3d3c2a669e5ca6c90c69dc519",
4849
},
4950
"1.24": {
50-
kindVersion: "v0.22.0",
51-
nodeImageVersion: "v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51",
51+
KindVersion: "v0.22.0",
52+
NodeImageVersion: "v1.24.17@sha256:bad10f9b98d54586cba05a7eaa1b61c6b90bfc4ee174fdc43a7b75ca75c95e51",
5253
},
5354
"1.23": {
54-
kindVersion: "v0.22.0",
55-
nodeImageVersion: "v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3",
55+
KindVersion: "v0.22.0",
56+
NodeImageVersion: "v1.23.17@sha256:14d0a9a892b943866d7e6be119a06871291c517d279aedb816a4b4bc0ec0a5b3",
5657
},
5758
"1.22": {
58-
kindVersion: "v0.20.0",
59-
nodeImageVersion: "v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2",
59+
KindVersion: "v0.20.0",
60+
NodeImageVersion: "v1.22.17@sha256:f5b2e5698c6c9d6d0adc419c0deae21a425c07d81bbf3b6a6834042f25d4fba2",
6061
},
6162
"1.21": {
62-
kindVersion: "v0.20.0",
63-
nodeImageVersion: "v1.21.14@sha256:8a4e9bb3f415d2bb81629ce33ef9c76ba514c14d707f9797a01e3216376ba093",
63+
KindVersion: "v0.20.0",
64+
NodeImageVersion: "v1.21.14@sha256:8a4e9bb3f415d2bb81629ce33ef9c76ba514c14d707f9797a01e3216376ba093",
6465
},
6566
"1.20": {
66-
kindVersion: "v0.17.0",
67-
nodeImageVersion: "v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394",
67+
KindVersion: "v0.17.0",
68+
NodeImageVersion: "v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394",
6869
},
6970
"1.19": {
70-
kindVersion: "v0.17.0",
71-
nodeImageVersion: "v1.19.16@sha256:476cb3269232888437b61deca013832fee41f9f074f9bed79f57e4280f7c48b7",
71+
KindVersion: "v0.17.0",
72+
NodeImageVersion: "v1.19.16@sha256:476cb3269232888437b61deca013832fee41f9f074f9bed79f57e4280f7c48b7",
7273
},
7374
// Use ubuntu 20.04 for the below k8s versions
7475
"1.18": {
75-
kindVersion: "v0.17.0",
76-
nodeImageVersion: "v1.18.20@sha256:61c9e1698c1cb19c3b1d8151a9135b379657aee23c59bde4a8d87923fcb43a91",
76+
KindVersion: "v0.17.0",
77+
NodeImageVersion: "v1.18.20@sha256:61c9e1698c1cb19c3b1d8151a9135b379657aee23c59bde4a8d87923fcb43a91",
7778
},
7879
"1.17": {
79-
kindVersion: "v0.17.0",
80-
nodeImageVersion: "v1.17.17@sha256:e477ee64df5731aa4ef4deabbafc34e8d9a686b49178f726563598344a3898d5",
80+
KindVersion: "v0.17.0",
81+
NodeImageVersion: "v1.17.17@sha256:e477ee64df5731aa4ef4deabbafc34e8d9a686b49178f726563598344a3898d5",
8182
},
8283
"1.16": {
83-
kindVersion: "v0.15.0",
84-
nodeImageVersion: "v1.16.15@sha256:64bac16b83b6adfd04ea3fbcf6c9b5b893277120f2b2cbf9f5fa3e5d4c2260cc",
84+
KindVersion: "v0.15.0",
85+
NodeImageVersion: "v1.16.15@sha256:64bac16b83b6adfd04ea3fbcf6c9b5b893277120f2b2cbf9f5fa3e5d4c2260cc",
8586
},
8687
}
8788

88-
// getKindVersionConfig returns the kind version and the kind node image to use based on kubernetes version
89-
func getKindVersionConfig(kubeVersion string) (*kindConfig, error) {
89+
// GetKindVersionConfig returns the kind version and the kind node image to use based on kubernetes version
90+
func GetKindVersionConfig(kubeVersion string) (*KindConfig, error) {
9091
kubeSemVer, err := semver.NewVersion(kubeVersion)
9192
if err != nil {
9293
return nil, err

0 commit comments

Comments
 (0)