From 57142728080146a894ab3b5a614bf7b1039991d5 Mon Sep 17 00:00:00 2001 From: Jon Huhn Date: Fri, 23 May 2025 11:31:46 -0500 Subject: [PATCH] Enable resource.k8s.io/v1beta2 for DRA templates --- templates/test/ci/cluster-template-prow-ci-version-dra.yaml | 2 +- templates/test/ci/patches/dra-kubeadmcontrolplane.yaml | 2 +- templates/test/dev/cluster-template-custom-builds-dra.yaml | 2 +- templates/test/dev/cluster-template-custom-builds-load-dra.yaml | 2 +- 4 files changed, 4 insertions(+), 4 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 index 3be3ec3aca0..8bd68f5375f 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml @@ -61,7 +61,7 @@ spec: apiServer: extraArgs: feature-gates: ${K8S_FEATURE_GATES:-"DynamicResourceAllocation=true"} - runtime-config: resource.k8s.io/v1beta1=true + runtime-config: resource.k8s.io/v1beta1=true,resource.k8s.io/v1beta2=true timeoutForControlPlane: 20m controllerManager: extraArgs: diff --git a/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml b/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml index dd10e118bb4..7fe84606479 100644 --- a/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml +++ b/templates/test/ci/patches/dra-kubeadmcontrolplane.yaml @@ -21,7 +21,7 @@ value: DynamicResourceAllocation=true - op: add path: /spec/kubeadmConfigSpec/clusterConfiguration/apiServer/extraArgs/runtime-config - value: resource.k8s.io/v1beta1=true + value: resource.k8s.io/v1beta1=true,resource.k8s.io/v1beta2=true - op: add path: /spec/kubeadmConfigSpec/clusterConfiguration/scheduler/extraArgs/feature-gates value: DynamicResourceAllocation=true diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml index b21d8173f17..ec00cc22318 100644 --- a/templates/test/dev/cluster-template-custom-builds-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-dra.yaml @@ -63,7 +63,7 @@ spec: apiServer: extraArgs: feature-gates: ${K8S_FEATURE_GATES:-"DynamicResourceAllocation=true"} - runtime-config: resource.k8s.io/v1beta1=true + runtime-config: resource.k8s.io/v1beta1=true,resource.k8s.io/v1beta2=true timeoutForControlPlane: 20m controllerManager: extraArgs: diff --git a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml index a68fb36be57..318fcbff6cb 100644 --- a/templates/test/dev/cluster-template-custom-builds-load-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-load-dra.yaml @@ -65,7 +65,7 @@ spec: apiServer: extraArgs: feature-gates: ${K8S_FEATURE_GATES:-"DynamicResourceAllocation=true"} - runtime-config: resource.k8s.io/v1beta1=true + runtime-config: resource.k8s.io/v1beta1=true,resource.k8s.io/v1beta2=true timeoutForControlPlane: 20m controllerManager: extraArgs: