Skip to content

Conversation

@camrynl
Copy link
Contributor

@camrynl camrynl commented Aug 1, 2022

Reason for Change:

Issue Fixed:

Requirements:

Notes:

@rbtr
Copy link
Collaborator

rbtr commented Aug 1, 2022

Suggested edit:

diff --git a/test/integration/manifests/cns/daemonset.yaml b/test/integration/manifests/cns/daemonset.yaml
index d03520be..4ca21eea 100644
--- a/test/integration/manifests/cns/daemonset.yaml
+++ b/test/integration/manifests/cns/daemonset.yaml
@@ -76,26 +76,19 @@ spec:
       initContainers:
         - name: init-cni-dropgz
           image: acnpublic.azurecr.io/cni-dropgz:v1.4.28-41-g3ecb7fb1
-          command: ["/dropgz"]
+          command: 
+          - "/dropgz"
+          - "deploy"
+          - "azure-vnet"
+          - "--out /opt/cni/bin/azure-vnet"
+          - "azure-linux-swift.conflist"
+          - "--out /etc/cni/net.d/10-azure.conflist"
           imagePullPolicy: Always
-          env:
-            - name: AZURE_CNI_OS
-              value: linux
-            - name: AZURE_CNI_TENANCY
-              value: singletenancy
-            - name: AZURE_CNI_MODE
-              value: transparent
-            - name: AZURE_CNI_IPAM
-              value: azure-vnet-ipam
-            - name: AZURE_CNI_EXEMPT
-              value: azure-vnet-telemetry,azure-vnet-telemetry.config
           volumeMounts:
             - name: cni-bin
               mountPath: /opt/cni/bin
             - name: cni-conflist
               mountPath: /etc/cni/net.d
-            - name: cni-datapath-log
-              mountPath: /var/log/azure-vnet.log
       hostNetwork: true
       volumes:
         - name: log
diff --git a/test/integration/setup_test.go b/test/integration/setup_test.go
index c737ccc2..f1e808f0 100644
--- a/test/integration/setup_test.go
+++ b/test/integration/setup_test.go
@@ -123,6 +123,8 @@ func installCNSDaemonset(ctx context.Context, clientset *kubernetes.Clientset, i
 
 	image, _ := parseImageString(cns.Spec.Template.Spec.Containers[0].Image)
 	cns.Spec.Template.Spec.Containers[0].Image = getImageString(image, imageTag)
+	initImage, _ := parseImageString(cns.Spec.Template.Spec.InitContainers[0].Image)
+	cns.Spec.Template.Spec.InitContainers[0].Image = getImageString(initImage, imageTag)
 	cnsDaemonsetClient := clientset.AppsV1().DaemonSets(cns.Namespace)
 
 	log.Printf("Installing CNS with image %s", cns.Spec.Template.Spec.Containers[0].Image)

@camrynl camrynl enabled auto-merge (squash) August 4, 2022 15:06
@camrynl camrynl merged commit 3a854f5 into Azure:master Aug 4, 2022
@camrynl camrynl deleted the swifte2e branch August 4, 2022 16:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants