From 61d4cd3be284f433a36d96274735e18de53fea67 Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Mon, 19 Apr 2021 11:16:24 -0700 Subject: [PATCH] Update OOT cloud-provider version and enable LB test --- ...ster-template-external-cloud-provider.yaml | 4 +-- .../cloud-controller-manager.yaml | 2 +- .../cloud-node-manager.yaml | 2 +- ...template-prow-external-cloud-provider.yaml | 4 +-- test/e2e/azure_test.go | 26 +++++++++---------- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/templates/cluster-template-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.yaml index 34c6c01e36c..7e8df0d68ad 100644 --- a/templates/cluster-template-external-cloud-provider.yaml +++ b/templates/cluster-template-external-cloud-provider.yaml @@ -375,7 +375,7 @@ data: effect: NoSchedule containers: - name: cloud-controller-manager - image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.2} + image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.4} imagePullPolicy: IfNotPresent command: ["cloud-controller-manager"] args: @@ -503,7 +503,7 @@ data: effect: NoSchedule containers: - name: cloud-node-manager - image: ${AZURE_CLOUD_NODE_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.2} + image: ${AZURE_CLOUD_NODE_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.4} imagePullPolicy: IfNotPresent command: - cloud-node-manager diff --git a/templates/flavors/external-cloud-provider/cloud-controller-manager.yaml b/templates/flavors/external-cloud-provider/cloud-controller-manager.yaml index 9f6c287a8b1..c4e0b75597a 100644 --- a/templates/flavors/external-cloud-provider/cloud-controller-manager.yaml +++ b/templates/flavors/external-cloud-provider/cloud-controller-manager.yaml @@ -148,7 +148,7 @@ spec: effect: NoSchedule containers: - name: cloud-controller-manager - image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.2} + image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.4} imagePullPolicy: IfNotPresent command: ["cloud-controller-manager"] args: diff --git a/templates/flavors/external-cloud-provider/cloud-node-manager.yaml b/templates/flavors/external-cloud-provider/cloud-node-manager.yaml index ef3e3e4bb4d..6eb476960a2 100644 --- a/templates/flavors/external-cloud-provider/cloud-node-manager.yaml +++ b/templates/flavors/external-cloud-provider/cloud-node-manager.yaml @@ -66,7 +66,7 @@ spec: effect: NoSchedule containers: - name: cloud-node-manager - image: ${AZURE_CLOUD_NODE_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.2} + image: ${AZURE_CLOUD_NODE_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.4} imagePullPolicy: IfNotPresent command: - cloud-node-manager diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml index 29cf462f5d3..569e8947041 100644 --- a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml +++ b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml @@ -380,7 +380,7 @@ data: effect: NoSchedule containers: - name: cloud-controller-manager - image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.2} + image: ${AZURE_CLOUD_CONTROLLER_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v0.7.4} imagePullPolicy: IfNotPresent command: ["cloud-controller-manager"] args: @@ -508,7 +508,7 @@ data: effect: NoSchedule containers: - name: cloud-node-manager - image: ${AZURE_CLOUD_NODE_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.2} + image: ${AZURE_CLOUD_NODE_MANAGER_IMG:=mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v0.7.4} imagePullPolicy: IfNotPresent command: - cloud-node-manager diff --git a/test/e2e/azure_test.go b/test/e2e/azure_test.go index 79eef40046b..50a543979b1 100644 --- a/test/e2e/azure_test.go +++ b/test/e2e/azure_test.go @@ -361,7 +361,7 @@ var _ = Describe("Workload cluster creation", func() { // ci-e2e.sh and Prow CI skip this test by default. // To include this test, set `GINKGO_SKIP=""`. Context("Creating a cluster that uses the external cloud provider", func() { - It("with a 3 control plane nodes and 2 worker nodes", func() { + It("with a 1 control plane nodes and 2 worker nodes", func() { clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{ ClusterProxy: bootstrapClusterProxy, ConfigCluster: clusterctl.ConfigClusterInput{ @@ -373,7 +373,7 @@ var _ = Describe("Workload cluster creation", func() { Namespace: namespace.Name, ClusterName: clusterName, KubernetesVersion: e2eConfig.GetVariable(capi_e2e.KubernetesVersion), - ControlPlaneMachineCount: pointer.Int64Ptr(3), + ControlPlaneMachineCount: pointer.Int64Ptr(1), WorkerMachineCount: pointer.Int64Ptr(2), }, WaitForClusterIntervals: e2eConfig.GetIntervals(specName, "wait-cluster"), @@ -381,18 +381,16 @@ var _ = Describe("Workload cluster creation", func() { WaitForMachinePools: e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"), }, result) - // TODO: fix and enable - //Context("Creating an accessible load balancer", func() { - // AzureLBSpec(ctx, func() AzureLBSpecInput { - // return AzureLBSpecInput{ - // BootstrapClusterProxy: bootstrapClusterProxy, - // Namespace: namespace, - // ClusterName: clusterName, - // SkipCleanup: skipCleanup, - // IsVMSS: false, - // } - // }) - //}) + Context("Creating an accessible load balancer", func() { + AzureLBSpec(ctx, func() AzureLBSpecInput { + return AzureLBSpecInput{ + BootstrapClusterProxy: bootstrapClusterProxy, + Namespace: namespace, + ClusterName: clusterName, + SkipCleanup: skipCleanup, + } + }) + }) }) })