From 9547347a04a311be5e355875f4540338b3fa71bb Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 11 Aug 2025 19:07:06 +0300 Subject: [PATCH 1/2] etcd-manager: Keep the ImageVolume feature gate for K8s 1.35 --- pkg/model/components/etcdmanager/options.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/model/components/etcdmanager/options.go b/pkg/model/components/etcdmanager/options.go index be192d8ed3..dff8eb668a 100644 --- 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{} } From 8c6ac690b174d39edaf9899b4b88c63c3196ebd5 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 11 Aug 2025 20:16:15 +0300 Subject: [PATCH 2/2] Bump skip.regex for failing tests to 1.35 --- tests/e2e/pkg/tester/skip_regex.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/e2e/pkg/tester/skip_regex.go b/tests/e2e/pkg/tester/skip_regex.go index d005f4a121..2c918ae313 100644 --- a/tests/e2e/pkg/tester/skip_regex.go +++ b/tests/e2e/pkg/tester/skip_regex.go @@ -83,12 +83,12 @@ func (t *Tester) setSkipRegexFlag() error { // https://github.com/kubernetes/kubernetes/blob/418ae605ec1b788d43bff7ac44af66d8b669b833/test/e2e/network/networking.go#L135 skipRegex += "|should.check.kube-proxy.urls" - if k8sVersion.Minor < 34 { + if k8sVersion.Minor < 35 { // This seems to be specific to the kube-proxy replacement - // < 34 so we look at this again + // < 35 so we look at this again skipRegex += "|Services.should.support.externalTrafficPolicy.Local.for.type.NodePort" // https://github.com/kubernetes/kubernetes/issues/129221 - // < 34 so we look at this again + // < 35 so we look at this again skipRegex += "|Services.should.implement.NodePort.and.HealthCheckNodePort.correctly.when.ExternalTrafficPolicy.changes" } @@ -107,21 +107,21 @@ func (t *Tester) setSkipRegexFlag() error { skipRegex += "|should.create.a.Pod.with.SCTP.HostPort" } - if k8sVersion.Minor < 34 { - // < 34 so we revisit this in future + if k8sVersion.Minor < 35 { + // < 35 so we revisit this in future // This test checks for kube-proxy on port 10249 (`127.0.0.1:10249/proxyMode`) // It appears that the cilium kube-proxy replacement does not implement this. // Ref: https://github.com/kubernetes/kubernetes/issues/126903 skipRegex += "|KubeProxy.should.update.metric.for.tracking.accepted.packets.destined.for.localhost.nodeports" } } else if networking.Calico != nil { - if cluster.Spec.LegacyCloudProvider == "gce" && k8sVersion.Minor < 34 { - // < 34 so we look at this again + if cluster.Spec.LegacyCloudProvider == "gce" && k8sVersion.Minor < 35 { + // < 35 so we look at this again skipRegex += "|Services.should.implement.NodePort.and.HealthCheckNodePort.correctly.when.ExternalTrafficPolicy.changes" } } else if networking.Flannel != nil { - if k8sVersion.Minor < 34 { - // < 34 so we look at this again + if k8sVersion.Minor < 35 { + // < 35 so we look at this again skipRegex += "|Services.should.implement.NodePort.and.HealthCheckNodePort.correctly.when.ExternalTrafficPolicy.changes" } } else if networking.KubeRouter != nil { @@ -183,8 +183,8 @@ func (t *Tester) setSkipRegexFlag() error { // ref: https://github.com/kubernetes/kubernetes/issues/123255 // ref: https://github.com/kubernetes/kubernetes/issues/121018 // ref: https://github.com/kubernetes/kubernetes/pull/126896 - // < 34 so we look at this again - if k8sVersion.Minor < 34 { + // < 35 so we look at this again + if k8sVersion.Minor < 35 { skipRegex += "|Services.should.function.for.service.endpoints.using.hostNetwork" }