Merge pull request #17340 from rifelpet/apiserver-cloudprovider-133

k8s-ci-robot · web-flow · commit 8726bea31e28 · 2025-04-04T22:16:38.000-07:00
Support 1.33 pre-releases with --cloud-provider flag removal validation
diff --git a/pkg/apis/kops/validation/legacy.go b/pkg/apis/kops/validation/legacy.go
@@ -187,7 +187,7 @@ func ValidateCluster(c *kops.Cluster, strict bool, vfsContext *vfs.VFSContext) f
 				}
 			}
 			if c.Spec.KubeAPIServer != nil && (strict || c.Spec.KubeAPIServer.CloudProvider != "") {
-				if k8sVersion != nil && k8sVersion.LT(semver.MustParse("1.33.0")) {
+				if k8sVersion != nil && k8sVersion.LT(semver.MustParse("1.33.0-alpha.3")) {
 					if c.Spec.KubeAPIServer.CloudProvider != "external" && k8sCloudProvider != c.Spec.KubeAPIServer.CloudProvider {
 						allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("kubeAPIServer", "cloudProvider"), "Did not match cluster cloudProvider"))
 					}

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func ValidateCluster(c kops.Cluster, strict bool, vfsContext vfs.VFSContext) f`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`	`if c.Spec.KubeAPIServer != nil && (strict \|\| c.Spec.KubeAPIServer.CloudProvider != "") {`
`190`		`- if k8sVersion != nil && k8sVersion.LT(semver.MustParse("1.33.0")) {`
	`190`	`+ if k8sVersion != nil && k8sVersion.LT(semver.MustParse("1.33.0-alpha.3")) {`
`191`	`191`	`if c.Spec.KubeAPIServer.CloudProvider != "external" && k8sCloudProvider != c.Spec.KubeAPIServer.CloudProvider {`
`192`	`192`	`allErrs = append(allErrs, field.Forbidden(fieldSpec.Child("kubeAPIServer", "cloudProvider"), "Did not match cluster cloudProvider"))`
`193`	`193`	`}`