Skip to content

Commit 21265a7

Browse files
rbtrrbtr
authored
backport: migrate from dropgz to azure-cni, azure-ipam (#2871)
feat: rip out dropgz (#2324) (#2339) Signed-off-by: Evan Baker <[email protected]>
1 parent 73a0919 commit 21265a7

27 files changed

+562
-623
lines changed

‎.pipelines/cni/singletenancy/windows-cni-load-test-template.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ stages:
7575
make -C ./hack/aks azcfg AZCLI=az REGION=$(LOCATION)
7676
dropgz_version=$(make cni-dropgz-version)
7777
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=$(os) ARCH=$(arch) OS_VERSION=$(os_version) CNI_DROPGZ_VERSION=${dropgz_version})
78-
envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
78+
envsubst < ./test/integration/manifests/cni/cni-installer.yaml | kubectl apply -f -
7979
name: "UploadCNI"
8080
displayName: "Upload CNI"
8181
- script: |

‎.pipelines/pipeline.yaml‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ stages:
3939
echo "##vso[task.setvariable variable=Tag;isOutput=true]$(make version)"
4040
echo "##vso[task.setvariable variable=cniVersion;isOutput=true]$(make cni-version)"
4141
echo "##vso[task.setvariable variable=npmVersion;isOutput=true]$(make npm-version)"
42-
echo "##vso[task.setvariable variable=dropgzVersion;isOutput=true]$(make cni-dropgz-version)"
4342
cat /etc/os-release
4443
uname -a
4544
sudo chown -R $(whoami):$(whoami) .
@@ -148,17 +147,32 @@ stages:
148147
name: "$(BUILD_POOL_NAME_LINUX_AMD64)"
149148
strategy:
150149
matrix:
151-
cni_dropgz_linux_amd64:
150+
azure_ipam_linux_amd64:
152151
arch: amd64
153-
name: cni-dropgz
152+
name: azure-ipam
154153
os: linux
155-
cni_dropgz_test_linux_amd64:
154+
azure_ipam_windows2019_amd64:
156155
arch: amd64
157-
name: cni-dropgz-test
156+
name: azure-ipam
157+
os: windows
158+
os_version: ltsc2019
159+
azure_ipam_windows2022_amd64:
160+
arch: amd64
161+
name: azure-ipam
162+
os: windows
163+
os_version: ltsc2022
164+
cni_linux_amd64:
165+
arch: amd64
166+
name: cni
158167
os: linux
159-
cni_dropgz_test_windows2022_amd64:
168+
cni_windows2019_amd64:
160169
arch: amd64
161-
name: cni-dropgz-test
170+
name: cni
171+
os: windows
172+
os_version: ltsc2019
173+
cni_windows2022_amd64:
174+
arch: amd64
175+
name: cni
162176
os: windows
163177
os_version: ltsc2022
164178
cns_linux_amd64:
@@ -199,13 +213,13 @@ stages:
199213
name: "$(BUILD_POOL_NAME_LINUX_ARM64)"
200214
strategy:
201215
matrix:
202-
cni_dropgz_linux_arm64:
216+
azure_ipam_linux_arm64:
203217
arch: arm64
204-
name: cni-dropgz
218+
name: azure-ipam
205219
os: linux
206-
cni_dropgz_test_linux_arm64:
220+
cni_linux_arm64:
207221
arch: arm64
208-
name: cni-dropgz-test
222+
name: cni
209223
os: linux
210224
cns_linux_arm64:
211225
arch: arm64
@@ -268,11 +282,13 @@ stages:
268282
name: "$(BUILD_POOL_NAME_DEFAULT)"
269283
strategy:
270284
matrix:
271-
cni_dropgz:
272-
name: cni-dropgz
273-
platforms: linux/amd64 linux/arm64
274-
cni_dropgz_test:
275-
name: cni-dropgz-test
285+
azure_ipam:
286+
name: azure-ipam
287+
os_versions: ltsc2019 ltsc2022
288+
platforms: linux/amd64 linux/arm64 windows/amd64
289+
cni:
290+
name: cni
291+
os_versions: ltsc2019 ltsc2022
276292
platforms: linux/amd64 linux/arm64 windows/amd64
277293
cns:
278294
name: cns
@@ -304,7 +320,6 @@ stages:
304320
parameters:
305321
name: "cilium_e2e"
306322
displayName: Cilium
307-
testDropgz: ""
308323
clusterType: cilium-podsubnet-up
309324
clusterName: "ciliume2e"
310325
vmSize: Standard_B2ms
@@ -315,7 +330,6 @@ stages:
315330
parameters:
316331
name: "cilium_overlay_cilium_e2e"
317332
displayName: Cilium on AKS Overlay
318-
testDropgz: ""
319333
clusterType: cilium-overlay-up
320334
clusterName: "overlaye2e"
321335
vmSize: Standard_B2ms
@@ -327,7 +341,6 @@ stages:
327341
name: "azure_overlay_e2e"
328342
displayName: Azure Overlay
329343
os: linux
330-
testDropgz: ""
331344
clusterType: overlay-byocni-up
332345
clusterName: "azurecnioverlaye2e"
333346
vmSize: Standard_B2ms
@@ -339,7 +352,6 @@ stages:
339352
name: "aks_swift_e2e"
340353
displayName: AKS Swift Ubuntu
341354
os: linux
342-
testDropgz: ""
343355
clusterType: swift-byocni-up
344356
clusterName: "swifte2e"
345357
vmSize: Standard_B2s

‎.pipelines/singletenancy/aks-swift/e2e-job-template.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
displayName: ""
4-
testDropgz: ""
54
clusterType: ""
65
clusterName: ""
76
vmSize: ""
@@ -58,7 +57,6 @@ stages:
5857
- template: e2e-step-template.yaml
5958
parameters:
6059
name: ${{ parameters.name }}
61-
testDropgz: ${{ parameters.testDropgz }}
6260
clusterName: ${{ parameters.clusterName }}-$(commitID)
6361

6462
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

‎.pipelines/singletenancy/aks-swift/e2e-step-template.yaml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
name: ""
3-
testDropgz: ""
43
clusterName: ""
54

65
steps:
@@ -43,28 +42,11 @@ steps:
4342
pwd
4443
kubectl cluster-info
4544
kubectl get po -owide -A
46-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_DROPGZ_VERSION=$(make cni-dropgz-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true TEST_DROPGZ=${{ parameters.testDropgz }}
45+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_VNET=true
4746
retryCountOnTaskFailure: 3
4847
name: "aksswifte2e"
4948
displayName: "Run AKS Swift E2E"
5049
51-
- script: |
52-
echo "Logs will be available as a build artifact"
53-
ARTIFACT_DIR=$(Build.ArtifactStagingDirectory)/aks-swift-output/
54-
echo $ARTIFACT_DIR
55-
sudo rm -rf $ARTIFACT_DIR
56-
sudo mkdir $ARTIFACT_DIR
57-
sudo cp test/integration/logs/* $ARTIFACT_DIR
58-
name: "GetLogs"
59-
displayName: "Get logs"
60-
condition: always()
61-
62-
- task: PublishBuildArtifacts@1
63-
inputs:
64-
artifactName: aks-swift-output
65-
pathtoPublish: "$(Build.ArtifactStagingDirectory)/aks-swift-output"
66-
condition: always()
67-
6850
- script: |
6951
echo "Run wireserver and metadata connectivity Tests"
7052
bash test/network/wireserver_metadata_test.sh

‎.pipelines/singletenancy/aks/e2e-job-template.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ stages:
4040
GOPATH: "$(Agent.TempDirectory)/go" # Go workspace path
4141
GOBIN: "$(GOPATH)/bin" # Go binaries path
4242
modulePath: "$(GOPATH)/src/github.com/Azure/azure-container-networking"
43-
dropgzVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.dropgzVersion'] ]
4443
cniVersion: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.cniVersion'] ]
4544
commitID: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.commitID'] ]
4645
dependsOn:
@@ -63,7 +62,6 @@ stages:
6362
arch: ${{ parameters.arch }}
6463
os: ${{ parameters.os }}
6564
os_version: ${{ parameters.os_version }}
66-
version: $(dropgzVersion)
6765
cniVersion: $(cniVersion)
6866
scaleup: ${{ parameters.scaleup }}
6967

‎.pipelines/singletenancy/aks/e2e-step-template.yaml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,10 @@ steps:
3030
set -e
3131
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3232
echo "Upload CNI"
33-
if [ "${{parameters.os}}" == "windows" ]; then
34-
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='linux' ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=${{ parameters.version }})
35-
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
36-
kubectl rollout status daemonset/azure-cni -n kube-system
37-
echo "Deploying on windows nodes"
38-
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS='windows' ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }} CNI_DROPGZ_VERSION=${{ parameters.version }})
39-
envsubst < ./test/integration/manifests/cni/cni-installer-v1-windows.yaml | kubectl apply -f -
40-
kubectl rollout status daemonset/azure-cni-windows -n kube-system
41-
else
42-
export DROP_GZ_URL=$( make cni-dropgz-test-image-name-and-tag OS=${{ parameters.os }} ARCH=${{ parameters.arch }} CNI_DROPGZ_VERSION=${{ parameters.version }})
43-
envsubst < ./test/integration/manifests/cni/cni-installer-v1.yaml | kubectl apply -f -
44-
kubectl rollout status daemonset/azure-cni -n kube-system
45-
fi
33+
export CNI_VERSION=$(make cni-version)
34+
envsubst < ./test/integration/manifests/cni/cni-installer.yaml | kubectl apply -f -
35+
kubectl rollout status daemonset/azure-cni -n kube-system
36+
kubectl rollout status daemonset/azure-cni-windows -n kube-system
4637
name: "UploadCni"
4738
displayName: "Upload CNI"
4839
- task: AzureCLI@1

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
displayName: ""
4-
testDropgz: ""
54
clusterType: ""
65
clusterName: ""
76
vmSize: ""
@@ -55,7 +54,6 @@ stages:
5554
- template: azure-cni-overlay-e2e-step-template.yaml
5655
parameters:
5756
name: ${{ parameters.name }}
58-
testDropgz: ${{ parameters.testDropgz }}
5957
clusterName: ${{ parameters.clusterName }}-$(commitID)
6058

6159
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

‎.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-step-template.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
name: ""
3-
testDropgz: ""
43
clusterName: ""
54

65
steps:
@@ -47,8 +46,7 @@ steps:
4746
kubectl apply -f config-reconcile.yaml
4847
cd ../../../..
4948
kubectl get po -owide -A
50-
CNS=$(make cns-version) DROPGZ=$(make cni-dropgz-version)
51-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
49+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=$(make cns-version) CNI_VERSION=$(make cni-version) INSTALL_CNS=true INSTALL_AZURE_CNI_OVERLAY=true
5250
retryCountOnTaskFailure: 3
5351
name: "integrationTest"
5452
displayName: "Run CNS Integration Tests on AKS Overlay"

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
parameters:
22
name: ""
33
displayName: ""
4-
testDropgz: ""
54
clusterType: ""
65
clusterName: ""
76
vmSize: ""
@@ -57,7 +56,6 @@ stages:
5756
- template: cilium-overlay-e2e-step-template.yaml
5857
parameters:
5958
name: ${{ parameters.name }}
60-
testDropgz: ${{ parameters.testDropgz }}
6159
clusterName: ${{ parameters.clusterName }}-$(commitID)
6260

6361
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
name: ""
3-
testDropgz: ""
43
clusterName: ""
54

65
steps:
@@ -86,11 +85,11 @@ steps:
8685
# Nightly does not build images per commit. Will use existing image.
8786
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]
8887
then
89-
CNS=$(CNS_VERSION) DROPGZ=$(DROP_GZ_VERSION) && echo "Running nightly"
88+
CNS=$(CNS_VERSION) CNI=$(CNI_VERSION) && echo "Running nightly"
9089
else
91-
CNS=$(make cns-version) DROPGZ=$(make cni-dropgz-version)
90+
CNS=$(make cns-version) CNI=$(make azure-ipam-version)
9291
fi
93-
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_DROPGZ_VERSION=${DROPGZ} INSTALL_CNS=true INSTALL_OVERLAY=true TEST_DROPGZ=${{ parameters.testDropgz }}
92+
sudo -E env "PATH=$PATH" make test-integration CNS_VERSION=${CNS} CNI_VERSION=${CNI} INSTALL_CNS=true INSTALL_OVERLAY=true INSTALL_AZILIUM=true
9493
retryCountOnTaskFailure: 3
9594
name: "aziliumTest"
9695
displayName: "Run Azilium E2E on AKS Overlay"

0 commit comments

Comments
 (0)