From 80153d6a444e40ded7fb1d47bcd7894f70f00d37 Mon Sep 17 00:00:00 2001 From: QxBytes Date: Fri, 27 Oct 2023 13:18:33 -0700 Subject: [PATCH 1/2] Add multitenancy transparent vlan conflist to dropgz --- dropgz/build/cniTest_linux.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/dropgz/build/cniTest_linux.Dockerfile b/dropgz/build/cniTest_linux.Dockerfile index b92b993c84..89788fd7bb 100644 --- a/dropgz/build/cniTest_linux.Dockerfile +++ b/dropgz/build/cniTest_linux.Dockerfile @@ -20,6 +20,7 @@ COPY --from=azure-ipam /azure-ipam/*.conflist pkg/embed/fs COPY --from=azure-ipam /azure-ipam/bin/* pkg/embed/fs COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS.conflist pkg/embed/fs/azure.conflist COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist pkg/embed/fs/azure-swift.conflist +COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-multitenancy-transparent-vlan.conflist pkg/embed/fs/azure-multitenancy-transparent-vlan.conflist COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay.conflist pkg/embed/fs/azure-swift-overlay.conflist COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay-dualstack.conflist pkg/embed/fs/azure-swift-overlay-dualstack.conflist COPY --from=azure-vnet /azure-container-networking/bin/* pkg/embed/fs From ccd3c018d2fb47f9757e2b18a8d9639b8919a01d Mon Sep 17 00:00:00 2001 From: QxBytes Date: Tue, 31 Oct 2023 09:58:28 -0700 Subject: [PATCH 2/2] Add multitenancy conflist to cni linux dockerfile --- cni/linux.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cni/linux.Dockerfile b/cni/linux.Dockerfile index 59efe173ed..32f0eb4a27 100644 --- a/cni/linux.Dockerfile +++ b/cni/linux.Dockerfile @@ -18,6 +18,7 @@ WORKDIR /payload COPY --from=azure-vnet /go/bin/* /payload COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS.conflist /payload/azure.conflist COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift.conflist /payload/azure-swift.conflist +COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-multitenancy-transparent-vlan.conflist /payload/azure-multitenancy-transparent-vlan.conflist COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay.conflist /payload/azure-swift-overlay.conflist COPY --from=azure-vnet /azure-container-networking/cni/azure-$OS-swift-overlay-dualstack.conflist /payload/azure-swift-overlay-dualstack.conflist COPY --from=azure-vnet /azure-container-networking/telemetry/azure-vnet-telemetry.config /payload/azure-vnet-telemetry.config