Merge pull request #1851 from nilo19/chore/mix-1.0

k8s-ci-robot · web-flow · commit 148a8fac0b4f · 2021-11-12T10:14:28.000-08:00
Cherry pick of #1830: chore: add mixed protocol feature gates
diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
@@ -60,6 +60,7 @@ spec:
         extraArgs:
           cloud-config: /etc/kubernetes/azure.json
           cloud-provider: azure
+          feature-gates: MixedProtocolLBService=true
         extraVolumes:
         - hostPath: /etc/kubernetes/azure.json
           mountPath: /etc/kubernetes/azure.json
diff --git a/templates/test/ci/patches/apiserver.yaml b/templates/test/ci/patches/apiserver.yaml
@@ -0,0 +1,10 @@
+kind: KubeadmControlPlane
+apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+metadata:
+  name: "${CLUSTER_NAME}-control-plane"
+spec:
+  kubeadmConfigSpec:
+    clusterConfiguration:
+      apiServer:
+        extraArgs:
+          feature-gates: MixedProtocolLBService=true
diff --git a/templates/test/ci/prow-external-cloud-provider/kustomization.yaml b/templates/test/ci/prow-external-cloud-provider/kustomization.yaml
@@ -8,6 +8,7 @@ patchesStrategicMerge:
   - ../patches/tags.yaml
   - ../patches/controller-manager.yaml
   - ../patches/cluster-cni.yaml
+  - ../patches/apiserver.yaml
 configMapGenerator:
   - name: cni-${CLUSTER_NAME}-calico
     files:
