fixup

kubernetes-sigs · Jan 4, 2023 · e7fd985 · e7fd985
1 parent 9da8b5b
commit e7fd985
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go
@@ -19,6 +19,7 @@ package v1beta1
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/blang/semver"
@@ -33,7 +34,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
-	"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/util/kubeadm"
+	"sigs.k8s.io/cluster-api/internal/util/kubeadm"
 	"sigs.k8s.io/cluster-api/util/container"
 	"sigs.k8s.io/cluster-api/util/version"
 )
@@ -617,15 +618,16 @@ func (in *KubeadmControlPlane) validateVersion(previousVersion string) (allErrs
 		)
 	}
 
-	if in.Spec.KubeadmConfigSpec.ClusterConfiguration != nil &&
+	// FIXME(later): enable again after all cases have been green in e2e tests before.
+	if os.Getenv("ENABLE_VALIDATION") == "true" && in.Spec.KubeadmConfigSpec.ClusterConfiguration != nil &&
 		in.Spec.KubeadmConfigSpec.ClusterConfiguration.ImageRepository == "" {
 		if toVersion.GTE(kubeadm.MinKubernetesVersionImageRegistryMigration) &&
 			toVersion.LT(kubeadm.NextKubernetesVersionImageRegistryMigration) {
 			if kubeadm.GetDefaultRegistry(toVersion) == kubeadm.OldKubernetesImageRepository {
 				allErrs = append(allErrs,
 					field.Forbidden(
 						field.NewPath("spec", "version"),
-						fmt.Sprintf("cannot upgrade to a Kubernetes (kubeadm) version which is using the old default registry. Please use a newer Kubernetes patch release which is using the new default registry (>= v1.22.17, >= v1.23.15, >= v1.24.9"),
+						"cannot upgrade to a Kubernetes (kubeadm) version which is using the old default registry. Please use a newer Kubernetes patch release which is using the new default registry (>= v1.22.17, >= v1.23.15, >= v1.24.9",
 					),
 				)
 			}

diff --git a/controlplane/kubeadm/internal/workload_cluster.go b/controlplane/kubeadm/internal/workload_cluster.go
@@ -47,7 +47,7 @@ import (
 	kubeadmtypes "sigs.k8s.io/cluster-api/bootstrap/kubeadm/types"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/proxy"
-	"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/util/kubeadm"
+	"sigs.k8s.io/cluster-api/internal/util/kubeadm"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/certs"
 	containerutil "sigs.k8s.io/cluster-api/util/container"

diff --git a/controlplane/kubeadm/internal/workload_cluster_coredns.go b/controlplane/kubeadm/internal/workload_cluster_coredns.go
@@ -35,7 +35,7 @@ import (
 
 	bootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
 	controlplanev1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
-	"sigs.k8s.io/cluster-api/controlplane/kubeadm/internal/util/kubeadm"
+	"sigs.k8s.io/cluster-api/internal/util/kubeadm"
 	containerutil "sigs.k8s.io/cluster-api/util/container"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/cluster-api/util/version"

diff --git a/.../kubeadm/internal/util/kubeadm/kubeadm.go → internal/util/kubeadm/kubeadm.go b/.../kubeadm/internal/util/kubeadm/kubeadm.go → internal/util/kubeadm/kubeadm.go
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package kubeadm contains utils related to kubeadm.
 package kubeadm
 
 import "github.com/blang/semver"
@@ -35,8 +36,8 @@ var (
 	NextKubernetesVersionImageRegistryMigration = semver.MustParse("1.26.0")
 )
 
+// GetDefaultRegistry returns the default registry of the given kubeadm version.
 func GetDefaultRegistry(version semver.Version) string {
-
 	// If version <= v1.22.16 return k8s.gcr.io
 	if version.LTE(semver.MustParse("1.22.16")) {
 		return OldKubernetesImageRepository

diff --git a/test/framework/daemonset_helpers.go b/test/framework/daemonset_helpers.go
@@ -26,6 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"sigs.k8s.io/cluster-api/internal/util/kubeadm"
 	containerutil "sigs.k8s.io/cluster-api/util/container"
 )
 
@@ -42,15 +43,9 @@ func WaitForKubeProxyUpgrade(ctx context.Context, input WaitForKubeProxyUpgradeI
 	parsedVersion, err := semver.ParseTolerant(input.KubernetesVersion)
 	Expect(err).ToNot(HaveOccurred())
 
-	// Beginning with kubernetes v1.22, kubernetes images including kube-proxy get published to registry.k8s.io.
-	// This ensures that the imageRepository setting gets patched to registry.k8s.io when upgrading from v1.21 or lower,
-	// but only if there was no imageRepository explicitly set at the KubeadmControlPlanes ClusterConfiguration.
-	// This follows the behavior of `kubeadm upgrade`.
-	wantKubeProxyRegistry := "registry.k8s.io"
-	if parsedVersion.LT(semver.Version{Major: 1, Minor: 22, Patch: 0, Pre: []semver.PRVersion{{VersionStr: "alpha"}}}) {
-		wantKubeProxyRegistry = "k8s.gcr.io"
-	}
-	wantKubeProxyImage := wantKubeProxyRegistry + "/kube-proxy:" + containerutil.SemverToOCIImageTag(input.KubernetesVersion)
+	// Validate the kube-proxy image according to how KCP sets the image in the kube-proxy DaemonSet.
+	// KCP does this based on the default registry of the Kubernetes (kubeadm) version.
+	wantKubeProxyImage := kubeadm.GetDefaultRegistry(parsedVersion) + "/kube-proxy:" + containerutil.SemverToOCIImageTag(input.KubernetesVersion)
 
 	Eventually(func() (bool, error) {
 		ds := &appsv1.DaemonSet{}