⚠️CABPK - Create v1alpha3 types

Makefile

@@ -153,6 +153,10 @@ generate-go: $(CONTROLLER_GEN) $(CONVERSION_GEN) ## Runs Go related generate tar
 		--input-dirs=./api/v1alpha2 \
 		--output-file-base=zz_generated.conversion \
 		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+	$(CONVERSION_GEN) \
+		--input-dirs=./bootstrap/kubeadm/api/v1alpha2 \
+		--output-file-base=zz_generated.conversion \
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 
 .PHONY: generate-bindata
 generate-bindata: $(KUSTOMIZE) $(GOBINDATA) clean-bindata ## Generate code for embedding the clusterctl api manifest
@@ -170,17 +174,14 @@ generate-bindata: $(KUSTOMIZE) $(GOBINDATA) clean-bindata ## Generate code for e
 generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 	$(CONTROLLER_GEN) \
 		paths=./api/... \
+		paths=./bootstrap/kubeadm/api/... \
 		paths=./controllers/... \
 		paths=./bootstrap/kubeadm/controllers/... \
 		crd:preserveUnknownFields=false \
 		rbac:roleName=manager-role \
 		output:crd:dir=./config/crd/bases \
 		output:webhook:dir=./config/webhook \
 		webhook
-	$(CONTROLLER_GEN) \
-		paths=./bootstrap/kubeadm/api/... \
-		crd:trivialVersions=true,preserveUnknownFields=false \
-		output:crd:dir=./config/crd/bases
 	$(CONTROLLER_GEN) \
 		paths=./cmd/clusterctl/api/... \
 		crd:trivialVersions=true,preserveUnknownFields=false \

api/v1alpha3/kubeadm_control_plane_types.go

@@ -19,7 +19,7 @@ package v1alpha3
 import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	cabpkv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha2"
+	cabpkv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/errors"
 )
 
@@ -90,7 +90,7 @@ type KubeadmControlPlaneStatus struct {
 	// state, and will be set to a token value suitable for
 	// programmatic interpretation.
 	// +optional
-	Failurereason errors.KubeadmControlPlaneStatusError `json:"failureReason,omitempty"`
+	FailureReason errors.KubeadmControlPlaneStatusError `json:"failureReason,omitempty"`
 
 	// ErrorMessage indicates that there is a terminal problem reconciling the
 	// state, and will be set to a descriptive error message.

bootstrap/kubeadm/PROJECT

@@ -8,3 +8,9 @@ resources:
 - group: bootstrap
   version: v1alpha2
   kind: KubeadmConfigTemplate
+- group: bootstrap
+  version: v1alpha3
+  kind: KubeadmConfig
+- group: bootstrap
+  version: v1alpha3
+  kind: KubeadmConfigTemplate

bootstrap/kubeadm/api/v1alpha2/conversion.go

@@ -0,0 +1,97 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha2
+
+import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	kubeadmbootstrapv1alpha3 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+// ConvertTo converts this KubeadmConfig to the Hub version (v1alpha3).
+func (src *KubeadmConfig) ConvertTo(dstRaw conversion.Hub) error { // nolint
+	dst := dstRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfig)
+	return Convert_v1alpha2_KubeadmConfig_To_v1alpha3_KubeadmConfig(src, dst, nil)
+}
+
+// ConvertFrom converts from the KubeadmConfig Hub version (v1alpha3) to this version.
+func (dst *KubeadmConfig) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+	src := srcRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfig)
+	return Convert_v1alpha3_KubeadmConfig_To_v1alpha2_KubeadmConfig(src, dst, nil)
+}
+
+// ConvertTo converts this KubeadmConfigList to the Hub version (v1alpha3).
+func (src *KubeadmConfigList) ConvertTo(dstRaw conversion.Hub) error { // nolint
+	dst := dstRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfigList)
+	return Convert_v1alpha2_KubeadmConfigList_To_v1alpha3_KubeadmConfigList(src, dst, nil)
+}
+
+// ConvertFrom converts from the KubeadmConfigList Hub version (v1alpha3) to this version.
+func (dst *KubeadmConfigList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+	src := srcRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfigList)
+	return Convert_v1alpha3_KubeadmConfigList_To_v1alpha2_KubeadmConfigList(src, dst, nil)
+}
+
+// ConvertTo converts this KubeadmConfigTemplate to the Hub version (v1alpha3).
+func (src *KubeadmConfigTemplate) ConvertTo(dstRaw conversion.Hub) error { // nolint
+	dst := dstRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfigTemplate)
+	return Convert_v1alpha2_KubeadmConfigTemplate_To_v1alpha3_KubeadmConfigTemplate(src, dst, nil)
+}
+
+// ConvertFrom converts from the KubeadmConfigTemplate Hub version (v1alpha3) to this version.
+func (dst *KubeadmConfigTemplate) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+	src := srcRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfigTemplate)
+	return Convert_v1alpha3_KubeadmConfigTemplate_To_v1alpha2_KubeadmConfigTemplate(src, dst, nil)
+}
+
+// ConvertTo converts this KubeadmConfigTemplateList to the Hub version (v1alpha3).
+func (src *KubeadmConfigTemplateList) ConvertTo(dstRaw conversion.Hub) error { // nolint
+	dst := dstRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfigTemplateList)
+	return Convert_v1alpha2_KubeadmConfigTemplateList_To_v1alpha3_KubeadmConfigTemplateList(src, dst, nil)
+}
+
+// ConvertFrom converts from the KubeadmConfigTemplateList Hub version (v1alpha3) to this version.
+func (dst *KubeadmConfigTemplateList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
+	src := srcRaw.(*kubeadmbootstrapv1alpha3.KubeadmConfigTemplateList)
+	return Convert_v1alpha3_KubeadmConfigTemplateList_To_v1alpha2_KubeadmConfigTemplateList(src, dst, nil)
+}
+
+// Convert_v1alpha2_KubeadmConfigStatus_To_v1alpha3_KubeadmConfigStatus converts this KubeadmConfigStatus to the Hub version (v1alpha3).
+func Convert_v1alpha2_KubeadmConfigStatus_To_v1alpha3_KubeadmConfigStatus(in *KubeadmConfigStatus, out *kubeadmbootstrapv1alpha3.KubeadmConfigStatus, s apiconversion.Scope) error { // nolint
+	if err := autoConvert_v1alpha2_KubeadmConfigStatus_To_v1alpha3_KubeadmConfigStatus(in, out, s); err != nil {
+		return err
+	}
+
+	// Manually convert the Error fields to the Failure fields
+	out.FailureMessage = in.ErrorMessage
+	out.FailureReason = in.ErrorReason
+
+	return nil
+}
+
+// Convert_v1alpha3_KubeadmConfigStatus_To_v1alpha2_KubeadmConfigStatus converts from the Hub version (v1alpha3) of the KubeadmConfigStatus to this version.
+func Convert_v1alpha3_KubeadmConfigStatus_To_v1alpha2_KubeadmConfigStatus(in *kubeadmbootstrapv1alpha3.KubeadmConfigStatus, out *KubeadmConfigStatus, s apiconversion.Scope) error { // nolint
+	if err := autoConvert_v1alpha3_KubeadmConfigStatus_To_v1alpha2_KubeadmConfigStatus(in, out, s); err != nil {
+		return err
+	}
+
+	// Manually convert the Failure fields to the Error fields
+	out.ErrorMessage = in.FailureMessage
+	out.ErrorReason = in.FailureReason
+
+	return nil
+}

bootstrap/kubeadm/api/v1alpha2/doc.go

@@ -0,0 +1,18 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1alpha3
+package v1alpha2

bootstrap/kubeadm/api/v1alpha2/groupversion_info.go

@@ -33,4 +33,6 @@ var (
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
+
+	localSchemeBuilder = SchemeBuilder.SchemeBuilder
 )

bootstrap/kubeadm/api/v1alpha2/kubeadmbootstrapconfig_types.go

@@ -82,7 +82,6 @@ type KubeadmConfigStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced,categories=cluster-api
-// +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 
 // KubeadmConfig is the Schema for the kubeadmconfigs API

bootstrap/kubeadm/api/v1alpha2/kubeadmconfigtemplate_types.go

@@ -27,7 +27,6 @@ type KubeadmConfigTemplateSpec struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=kubeadmconfigtemplates,scope=Namespaced,categories=cluster-api
-// +kubebuilder:storageversion
 
 // KubeadmConfigTemplate is the Schema for the kubeadmconfigtemplates API
 type KubeadmConfigTemplate struct {