From e9044eef5e15389bb9b331a86ab225fca8e281e7 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 22 May 2024 10:10:32 -0600 Subject: [PATCH] Remove MixedProtocolLBService feature flag --- templates/test/ci/cluster-template-prow-edgezone.yaml | 1 - .../ci/cluster-template-prow-workload-identity.yaml | 1 - templates/test/ci/patches/apiserver.yaml | 10 ---------- templates/test/ci/prow-edgezone/kustomization.yaml | 1 - .../test/ci/prow-workload-identity/kustomization.yaml | 1 - 5 files changed, 14 deletions(-) delete mode 100644 templates/test/ci/patches/apiserver.yaml diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index 0784e48b6a6..6f2854ddac3 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -60,7 +60,6 @@ spec: apiServer: extraArgs: cloud-provider: external - feature-gates: MixedProtocolLBService=true timeoutForControlPlane: 20m controllerManager: extraArgs: diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index d51df2ce7f6..13f3e480371 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -57,7 +57,6 @@ spec: apiServer: extraArgs: cloud-provider: external - feature-gates: MixedProtocolLBService=true timeoutForControlPlane: 20m controllerManager: extraArgs: diff --git a/templates/test/ci/patches/apiserver.yaml b/templates/test/ci/patches/apiserver.yaml deleted file mode 100644 index 4b35ef34e88..00000000000 --- a/templates/test/ci/patches/apiserver.yaml +++ /dev/null @@ -1,10 +0,0 @@ -kind: KubeadmControlPlane -apiVersion: controlplane.cluster.x-k8s.io/v1beta1 -metadata: - name: "${CLUSTER_NAME}-control-plane" -spec: - kubeadmConfigSpec: - clusterConfiguration: - apiServer: - extraArgs: - feature-gates: MixedProtocolLBService=true \ No newline at end of file diff --git a/templates/test/ci/prow-edgezone/kustomization.yaml b/templates/test/ci/prow-edgezone/kustomization.yaml index ca45d8d5814..c0af3e8fc6c 100644 --- a/templates/test/ci/prow-edgezone/kustomization.yaml +++ b/templates/test/ci/prow-edgezone/kustomization.yaml @@ -10,7 +10,6 @@ resources: patches: - path: ../patches/tags.yaml - path: ../patches/controller-manager.yaml -- path: ../patches/apiserver.yaml - path: ../patches/uami-md-0.yaml - path: ../patches/uami-control-plane.yaml - path: patches/azurecluster-edgezone.yaml diff --git a/templates/test/ci/prow-workload-identity/kustomization.yaml b/templates/test/ci/prow-workload-identity/kustomization.yaml index 0bf0dc13ef4..5853e40b6a1 100644 --- a/templates/test/ci/prow-workload-identity/kustomization.yaml +++ b/templates/test/ci/prow-workload-identity/kustomization.yaml @@ -11,7 +11,6 @@ patches: - path: ../patches/azureclusteridentity-azwi.yaml - path: ../patches/tags.yaml - path: ../patches/controller-manager.yaml -- path: ../patches/apiserver.yaml - path: ../patches/uami-md-0.yaml - path: ../patches/uami-control-plane.yaml - path: ../patches/cluster-label-calico.yaml