Merge pull request #7438 from sbueringer/pr-make-cert-mutable

k8s-ci-robot · web-flow · commit d356a77a959d · 2022-10-21T05:27:51.000-07:00
🌱 KCP: make rolloutBefore.certificatesExpiryDays mutable
diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go
@@ -168,6 +168,7 @@ func (in *KubeadmControlPlane) ValidateUpdate(old runtime.Object) error {
 		{spec, "replicas"},
 		{spec, "version"},
 		{spec, "rolloutAfter"},
+		{spec, "rolloutBefore", "*"},
 		{spec, "rolloutStrategy", "*"},
 	}
 
diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
@@ -404,6 +404,9 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 	validUpdate.Spec.Replicas = pointer.Int32(5)
 	now := metav1.NewTime(time.Now())
 	validUpdate.Spec.RolloutAfter = &now
+	validUpdate.Spec.RolloutBefore = &RolloutBefore{
+		CertificatesExpiryDays: pointer.Int32(14),
+	}
 	validUpdate.Spec.KubeadmConfigSpec.Format = bootstrapv1.CloudConfig
 
 	scaleToZero := before.DeepCopy()

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,7 @@ func (in *KubeadmControlPlane) ValidateUpdate(old runtime.Object) error {`
`168`	`168`	`{spec, "replicas"},`
`169`	`169`	`{spec, "version"},`
`170`	`170`	`{spec, "rolloutAfter"},`
	`171`	`+ {spec, "rolloutBefore", "*"},`
`171`	`172`	`{spec, "rolloutStrategy", "*"},`
`172`	`173`	`}`
`173`	`174`