Adding the telemetry config to the cluster

Azure · Jul 13, 2023 · fd345f0 · fd345f0
1 parent 6e43b30
commit fd345f0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/cni/build/windows.Dockerfile b/cni/build/windows.Dockerfile
@@ -13,6 +13,7 @@ FROM mcr.microsoft.com/windows/servercore:${OS_VERSION}
 SHELL ["powershell", "-command"]
 COPY --from=builder /azure-container-networking/azure-vnet.exe azure-vnet.exe
 COPY --from=builder /azure-container-networking/azure-vnet-telemetry.exe azure-vnet-telemetry.exe
+COPY --from=builder /azure-container-networking/telemetry/azure-vnet-telemetry.config azure-vnet-telemetry.config
 COPY --from=builder /azure-container-networking/azure-vnet-ipam.exe azure-vnet-ipam.exe
 
 # This would be replaced with dropgz version of windows.

diff --git a/dropgz/build/linux.Dockerfile b/dropgz/build/linux.Dockerfile
@@ -33,6 +33,7 @@ COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay-d
 COPY --from=azure-vnet /azure-container-networking/azure-vnet pkg/embed/fs
 COPY --from=azure-vnet /azure-container-networking/azure-vnet-telemetry pkg/embed/fs
 COPY --from=azure-vnet /azure-container-networking/azure-vnet-ipam pkg/embed/fs
+COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetry.config pkg/embed/fs
 RUN cd pkg/embed/fs/ && sha256sum * > sum.txt
 RUN gzip --verbose --best --recursive pkg/embed/fs && for f in pkg/embed/fs/*.gz; do mv -- "$f" "${f%%.gz}"; done
 

diff --git a/hack/scripts/updatecni.ps1 b/hack/scripts/updatecni.ps1
@@ -2,6 +2,7 @@ Write-Host $env:CONTAINER_SANDBOX_MOUNT_POINT
 $sourceCNI = $env:CONTAINER_SANDBOX_MOUNT_POINT + "azure-vnet.exe"
 $sourceIpam = $env:CONTAINER_SANDBOX_MOUNT_POINT + "azure-vnet-ipam.exe"
 $sourceTelemetry = $env:CONTAINER_SANDBOX_MOUNT_POINT + "azure-vnet-telemetry.exe"
+$sourceTelemetryConfig = $env:CONTAINER_SANDBOX_MOUNT_POINT + "azure-vnet-telemetry.config"
 
 $sourceCNIVersion = & "$sourceCNI" -v
 $currentVersion = ""
@@ -36,6 +37,10 @@ if ($currentTelemetryVersion -ne $sourceTelemetryVersion){
     Write-Host "copying azure-vnet-telemetry to windows node..."
     Remove-Item "C:\k\azurecni\bin\azure-vnet-telemetry.exe"
     Copy-Item $sourceTelemetry -Destination "C:\k\azurecni\bin"
+
+    Write-Host "copying azure-vnet-telemetry.config to windows node..."
+    Remove-Item "C:\k\azurecni\bin\azure-vnet-telemetry.config"
+    Copy-Item $sourceTelemetryConfig -Destination "C:\k\azurecni\bin"
 }
 
 ## check CNI was already installed so not to get stuck in a infinite loop of rebooting

diff --git a/test/integration/manifests/cni/cni-installer-v1.yaml b/test/integration/manifests/cni/cni-installer-v1.yaml
@@ -56,6 +56,9 @@ spec:
             - azure.conflist
             - -o
             - /etc/cni/net.d/10-azure.conflist
+            - azure-vnet-telemetry.config
+            - -o
+            - /opt/cni/bin/azure-vnet-telemetry.config
           volumeMounts:
             - name: cni-bin
               mountPath: /opt/cni/bin