etcd-manager: Keep the ImageVolume feature gate for K8s 1.35

hakman · hakman · commit 9547347a04a3 · 2025-08-11T19:07:06.000+03:00
diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go
@@ -42,7 +42,7 @@ func (b *EtcdManagerOptionsBuilder) BuildOptions(o *kops.Cluster) error {
 
 	// Image Volumes will become GA in Kubernetes 1.35
 	// https://github.com/kubernetes/enhancements/pull/5450
-	if b.ControlPlaneKubernetesVersion().IsLT("1.35.0") && o.HasImageVolumesSupport() {
+	if b.ControlPlaneKubernetesVersion().IsLT("1.36.0") && o.HasImageVolumesSupport() {
 		if clusterSpec.ControlPlaneKubelet == nil {
 			clusterSpec.ControlPlaneKubelet = &kops.KubeletConfigSpec{}
 		}

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (b EtcdManagerOptionsBuilder) BuildOptions(o kops.Cluster) error {`
`42`	`42`
`43`	`43`	`// Image Volumes will become GA in Kubernetes 1.35`
`44`	`44`	`// https://github.com/kubernetes/enhancements/pull/5450`
`45`		`- if b.ControlPlaneKubernetesVersion().IsLT("1.35.0") && o.HasImageVolumesSupport() {`
	`45`	`+ if b.ControlPlaneKubernetesVersion().IsLT("1.36.0") && o.HasImageVolumesSupport() {`
`46`	`46`	`if clusterSpec.ControlPlaneKubelet == nil {`
`47`	`47`	`clusterSpec.ControlPlaneKubelet = &kops.KubeletConfigSpec{}`
`48`	`48`	`}`