Merge pull request #5182 from detiber/kcpUpgradeNPE

🐛 [e2e framework] Avoid NPE when KCP does not specify ClusterConfiguration
kubernetes-sigs · Sep 1, 2021 · fde4fcb · fde4fcb
2 parents 95cb704 + 7601ebd
commit fde4fcb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/test/framework/controlplane_helpers.go b/test/framework/controlplane_helpers.go
@@ -300,6 +300,12 @@ func UpgradeControlPlaneAndWaitForUpgrade(ctx context.Context, input UpgradeCont
 	Expect(err).ToNot(HaveOccurred())
 
 	input.ControlPlane.Spec.Version = input.KubernetesUpgradeVersion
+
+	// If the ClusterConfiguration is not specified, create an empty one.
+	if input.ControlPlane.Spec.KubeadmConfigSpec.ClusterConfiguration == nil {
+		input.ControlPlane.Spec.KubeadmConfigSpec.ClusterConfiguration = new(bootstrapv1.ClusterConfiguration)
+	}
+
 	input.ControlPlane.Spec.KubeadmConfigSpec.ClusterConfiguration.Etcd = bootstrapv1.Etcd{
 		Local: &bootstrapv1.LocalEtcd{
 			ImageMeta: bootstrapv1.ImageMeta{