Merge pull request #5869 from kinvolk/invidian/cloud-init-default-web…

…hook ✨Set default KubeadmConfig format to cloud-config✨
kubernetes-sigs · Jan 3, 2022 · a1b5189 · a1b5189
2 parents aca9f2f + 396bf69
commit a1b5189
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 1 deletion.
diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadmconfig_types.go
@@ -79,6 +79,7 @@ type KubeadmConfigSpec struct {
 
 	// Format specifies the output format of the bootstrap data
 	// +optional
+	// +kubebuilder:default=cloud-config
 	Format Format `json:"format,omitempty"`
 
 	// Verbosity is the number for the kubeadm log level verbosity.

diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -2464,6 +2464,7 @@ spec:
                   type: object
                 type: array
               format:
+                default: cloud-config
                 description: Format specifies the output format of the bootstrap data
                 enum:
                 - cloud-config

diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -2478,6 +2478,7 @@ spec:
                           type: object
                         type: array
                       format:
+                        default: cloud-config
                         description: Format specifies the output format of the bootstrap
                           data
                         enum:

diff --git a/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go b/controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go
@@ -59,7 +59,7 @@ func TestKubeadmControlPlaneDefault(t *testing.T) {
 		Name:       "foo",
 		Namespace:  "foo",
 	}
-	t.Run("for KubeadmControlPLane", utildefaulting.DefaultValidateTest(updateDefaultingValidationKCP))
+	t.Run("for KubeadmControlPlane", utildefaulting.DefaultValidateTest(updateDefaultingValidationKCP))
 	kcp.Default()
 
 	g.Expect(kcp.Spec.MachineTemplate.InfrastructureRef.Namespace).To(Equal(kcp.Namespace))

diff --git a/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
@@ -2923,6 +2923,7 @@ spec:
                       type: object
                     type: array
                   format:
+                    default: cloud-config
                     description: Format specifies the output format of the bootstrap
                       data
                     enum:

diff --git a/.../kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml b/.../kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml
@@ -1707,6 +1707,7 @@ spec:
                               type: object
                             type: array
                           format:
+                            default: cloud-config
                             description: Format specifies the output format of the
                               bootstrap data
                             enum: