Merge pull request #2604 from chuckha/upgrade-after-field

🐛 Enable upgradeAfter field to be modifiable
kubernetes-sigs · Mar 9, 2020 · 37fec77 · 37fec77
2 parents 5154da4 + 6a08677
commit 37fec77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_webhook.go b/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_webhook.go
@@ -78,6 +78,7 @@ func (in *KubeadmControlPlane) ValidateUpdate(old runtime.Object) error {
 		{spec, "infrastructureTemplate", "name"},
 		{spec, "replicas"},
 		{spec, "version"},
+		{spec, "upgradeAfter"},
 	}
 
 	allErrs := in.validateCommon()

diff --git a/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_webhook_test.go b/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_webhook_test.go
@@ -178,6 +178,8 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 	validUpdate.Spec.Version = "v1.16.6"
 	validUpdate.Spec.InfrastructureTemplate.Name = "orange"
 	validUpdate.Spec.Replicas = pointer.Int32Ptr(5)
+	now := metav1.NewTime(time.Now())
+	validUpdate.Spec.UpgradeAfter = &now
 
 	scaleToZero := before.DeepCopy()
 	scaleToZero.Spec.Replicas = pointer.Int32Ptr(0)