Merge pull request #5242 from nojnhuh/hpa-metrics-flag

Remove deprecated HPAContainerMetrics feature gate from templates
kubernetes-sigs · Nov 5, 2024 · d1899f8 · d1899f8
2 parents e2ad4e2 + fa612e8
commit d1899f8
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 19 deletions.
diff --git a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml
diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
diff --git a/templates/test/ci/patches/controller-manager-featuregates.yaml b/templates/test/ci/patches/controller-manager-featuregates.yaml
diff --git a/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml b/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml
@@ -18,7 +18,7 @@
   value: ${K8S_FEATURE_GATES:-"DynamicResourceAllocation=true"}
 - op: add
   path: /spec/kubeadmConfigSpec/clusterConfiguration/controllerManager/extraArgs/feature-gates
-  value: HPAContainerMetrics=true,DynamicResourceAllocation=true
+  value: DynamicResourceAllocation=true
 - op: add
   path: /spec/kubeadmConfigSpec/clusterConfiguration/apiServer/extraArgs/runtime-config
   value: resource.k8s.io/v1alpha3=true

diff --git a/templates/test/ci/prow-ci-version/kustomization.yaml b/templates/test/ci/prow-ci-version/kustomization.yaml
@@ -54,7 +54,6 @@ patches:
 - path: patches/machine-deployment-ci-version-windows.yaml
 - path: patches/machine-deployment-ci-version-control-plane.yaml
 - path: ../patches/metrics-server-enabled-cluster.yaml
-- path: ../patches/controller-manager-featuregates.yaml
 - path: ../patches/uami-md-0.yaml
 configMapGenerator:
 - behavior: merge

diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml
diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
diff --git a/templates/test/dev/custom-builds/kustomization.yaml b/templates/test/dev/custom-builds/kustomization.yaml
@@ -51,7 +51,6 @@ patches:
 - path: ../../../test/ci/patches/windows-containerd-labels.yaml
 - path: ../../../test/ci/patches/windows-machine-deployment-replicas.yaml
 - path: ../../../test/ci/patches/metrics-server-enabled-cluster.yaml
-- path: ../../../test/ci/patches/controller-manager-featuregates.yaml
 configMapGenerator:
 - behavior: merge
   files: