Skip to content

Commit f7fe7da

Browse files
committed
KCP: fix rollout after upgrade
1 parent 1a5c13c commit f7fe7da

6 files changed

+6
-9
lines changed

bootstrap/kubeadm/api/v1beta1/kubeadm_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ type NodeRegistrationOptions struct {
258258
// "Never". Defaults to "IfNotPresent". This can be used only
259259
// with Kubernetes version equal to 1.22 and later.
260260
// +kubebuilder:validation:Enum=Always;IfNotPresent;Never
261-
// +kubebuilder:default=IfNotPresent
262261
// +optional
263262
ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
264263
}

bootstrap/kubeadm/api/v1beta1/kubeadmconfig_webhook.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ func DefaultKubeadmConfigSpec(r *KubeadmConfigSpec) {
5858
if r.Format == "" {
5959
r.Format = CloudConfig
6060
}
61+
if r.InitConfiguration != nil && r.InitConfiguration.NodeRegistration.ImagePullPolicy == "" {
62+
r.InitConfiguration.NodeRegistration.ImagePullPolicy = "IfNotPresent"
63+
}
64+
if r.JoinConfiguration != nil && r.JoinConfiguration.NodeRegistration.ImagePullPolicy == "" {
65+
r.JoinConfiguration.NodeRegistration.ImagePullPolicy = "IfNotPresent"
66+
}
6167
}
6268

6369
// +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

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)