Merge pull request #8125 from sbueringer/pr-fix-kcp-rollout

🐛 KCP: fix rollout after upgrade

Author: k8s-ci-robot

bootstrap/kubeadm/api/v1beta1/kubeadm_types.go

@@ -258,7 +258,6 @@ type NodeRegistrationOptions struct {
 	// "Never". Defaults to "IfNotPresent". This can be used only
 	// with Kubernetes version equal to 1.22 and later.
 	// +kubebuilder:validation:Enum=Always;IfNotPresent;Never
-	// +kubebuilder:default=IfNotPresent
 	// +optional
 	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
 }

bootstrap/kubeadm/api/v1beta1/kubeadmconfig_webhook.go

@@ -58,6 +58,12 @@ func DefaultKubeadmConfigSpec(r *KubeadmConfigSpec) {
 	if r.Format == "" {
 		r.Format = CloudConfig
 	}
+	if r.InitConfiguration != nil && r.InitConfiguration.NodeRegistration.ImagePullPolicy == "" {
+		r.InitConfiguration.NodeRegistration.ImagePullPolicy = "IfNotPresent"
+	}
+	if r.JoinConfiguration != nil && r.JoinConfiguration.NodeRegistration.ImagePullPolicy == "" {
+		r.JoinConfiguration.NodeRegistration.ImagePullPolicy = "IfNotPresent"
+	}
 }
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-bootstrap-cluster-x-k8s-io-v1beta1-kubeadmconfig,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=bootstrap.cluster.x-k8s.io,resources=kubeadmconfigs,versions=v1beta1,name=validation.kubeadmconfig.bootstrap.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1