migrate v1alpha4 to v1beta1 (#445)

* migrate v1alpha4 to v1beta1

Signed-off-by: Prajyot-Parab <[email protected]>

* part-2: migrate v1alpha4 to v1beta1

Signed-off-by: Prajyot-Parab <[email protected]>

* part-3: migrate v1alpha4 to v1beta1

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

Makefile

@@ -31,6 +31,7 @@ GO_INSTALL = ./scripts/go_install.sh
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
 KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize
 GOJQ := $(TOOLS_BIN_DIR)/gojq
+CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
 
 STAGING_REGISTRY ?= gcr.io/k8s-staging-capi-ibmcloud
 STAGING_BUCKET ?= artifacts.k8s-staging-capi-ibmcloud.appspot.com
@@ -62,6 +63,13 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
+# Set --output-base for conversion-gen if we are not within GOPATH
+ifneq ($(abspath $(ROOT_DIR_RELATIVE)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api-provider-ibmcloud)
+	CONVERSION_GEN_OUTPUT_BASE := --output-base=$(ROOT_DIR_RELATIVE)
+else
+	export GOPATH := $(shell go env GOPATH)
+endif
+
 all: manager
 
 # Run tests
@@ -93,6 +101,16 @@ deploy: manifests $(KUSTOMIZE)
 manifests: controller-gen
 	#$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role paths="./..." output:crd:artifacts:config=config/crd/bases
+
+.PHONY: generate-go-conversions-core
+generate-go-conversions-core: $(CONVERSION_GEN)
+	$(MAKE) clean-generated-conversions SRC_DIRS="./api/v1alpha4"
+	$(CONVERSION_GEN) \
+		--input-dirs=./api/v1alpha4 \
+		--build-tag=ignore_autogenerated_core \
+		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE) \
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+
 # Run go fmt against code
 fmt:
 	go fmt ./...
@@ -301,6 +319,10 @@ clean-temporary: ## Remove all temporary files and folders
 clean-release: ## Remove the release folder
 	rm -rf $(RELEASE_DIR)
 
+.PHONY: clean-generated-conversions
+clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs
+	(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)
+
 .PHONY: verify
 verify:
 	./hack/verify-boilerplate.sh

PROJECT

@@ -1,6 +1,16 @@
 domain: cluster.x-k8s.io
 repo: sigs.k8s.io/cluster-api-provider-ibmcloud
 resources:
+# v1alpha4 types
+- group: infrastructure
+  kind: IBMVPCCluster
+  version: v1alpha4
+- group: infrastructure
+  kind: IBMVPCMachine
+  version: v1alpha4
+- group: infrastructure
+  kind: IBMVPCMachineTemplate
+  version: v1alpha4
 - group: infrastructure
   kind: IBMPowerVSCluster
   version: v1alpha4
@@ -10,4 +20,23 @@ resources:
 - group: infrastructure
   kind: IBMPowerVSMachineTemplate
   version: v1alpha4
+# v1beta1 types
+- group: infrastructure
+  kind: IBMVPCCluster
+  version: v1beta1
+- group: infrastructure
+  kind: IBMVPCMachine
+  version: v1beta1
+- group: infrastructure
+  kind: IBMVPCMachineTemplate
+  version: v1beta1
+- group: infrastructure
+  kind: IBMPowerVSCluster
+  version: v1beta1
+- group: infrastructure
+  kind: IBMPowerVSMachine
+  version: v1beta1
+- group: infrastructure
+  kind: IBMPowerVSMachineTemplate
+  version: v1beta1
 version: "2"

api/v1alpha3/ibmvpccluster_types.go

@@ -18,7 +18,7 @@ package v1alpha3
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
@@ -60,7 +60,7 @@ type IBMVPCClusterStatus struct {
 	// Bastion Instance `json:"bastion,omitempty"`
 	Ready       bool        `json:"ready"`
 	Subnet      Subnet      `json:"subnet,omitempty"`
-	APIEndpoint APIEndpoint `json:"apiEndpoint,omitempty"`
+	VPCEndpoint VPCEndpoint `json:"vpcEndpoint,omitempty"`
 }
 
 // VPC holds the VPC information

api/v1alpha3/types.go

@@ -30,8 +30,8 @@ type Subnet struct {
 	Zone          *string `json:"zone"`
 }
 
-// APIEndpoint describes a APIEndpoint
-type APIEndpoint struct {
+// VPCEndpoint describes a VPCEndpoint
+type VPCEndpoint struct {
 	Address *string `json:"address"`
 	FIPID   *string `json:"floatingIPID"`
 }

api/v1alpha3/zz_generated.deepcopy.go

@@ -0,0 +1,31 @@
+/*
+Copyright 2021 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 v1alpha4
+
+import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+	clusterv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+)
+
+func Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in *clusterv1alpha4.APIEndpoint, out *clusterv1.APIEndpoint, s apiconversion.Scope) error {
+	return clusterv1alpha4.Convert_v1alpha4_APIEndpoint_To_v1beta1_APIEndpoint(in, out, s)
+}
+
+func Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in *clusterv1.APIEndpoint, out *clusterv1alpha4.APIEndpoint, s apiconversion.Scope) error {
+	return clusterv1alpha4.Convert_v1beta1_APIEndpoint_To_v1alpha4_APIEndpoint(in, out, s)
+}

api/v1alpha4/conversion.go

@@ -0,0 +1,19 @@
+/*
+Copyright 2021 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 v1alpha4 contains the v1alpha4 API implementation.
+// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1
+package v1alpha4

api/v1alpha4/doc.go

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

api/v1alpha4/groupversion_info.go

@@ -0,0 +1,94 @@
+/*
+Copyright 2020 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 v1alpha4
+
+import (
+	"sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+func (src *IBMPowerVSCluster) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*v1beta1.IBMPowerVSCluster)
+
+	return Convert_v1alpha4_IBMPowerVSCluster_To_v1beta1_IBMPowerVSCluster(src, dst, nil)
+}
+
+func (dst *IBMPowerVSCluster) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*v1beta1.IBMPowerVSCluster)
+
+	return Convert_v1beta1_IBMPowerVSCluster_To_v1alpha4_IBMPowerVSCluster(src, dst, nil)
+}
+
+func (src *IBMPowerVSClusterList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*v1beta1.IBMPowerVSClusterList)
+
+	return Convert_v1alpha4_IBMPowerVSClusterList_To_v1beta1_IBMPowerVSClusterList(src, dst, nil)
+}
+
+func (dst *IBMPowerVSClusterList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*v1beta1.IBMPowerVSClusterList)
+
+	return Convert_v1beta1_IBMPowerVSClusterList_To_v1alpha4_IBMPowerVSClusterList(src, dst, nil)
+}
+
+func (src *IBMPowerVSMachine) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*v1beta1.IBMPowerVSMachine)
+
+	return Convert_v1alpha4_IBMPowerVSMachine_To_v1beta1_IBMPowerVSMachine(src, dst, nil)
+}
+
+func (dst *IBMPowerVSMachine) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*v1beta1.IBMPowerVSMachine)
+
+	return Convert_v1beta1_IBMPowerVSMachine_To_v1alpha4_IBMPowerVSMachine(src, dst, nil)
+}
+
+func (src *IBMPowerVSMachineList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*v1beta1.IBMPowerVSMachineList)
+
+	return Convert_v1alpha4_IBMPowerVSMachineList_To_v1beta1_IBMPowerVSMachineList(src, dst, nil)
+}
+
+func (dst *IBMPowerVSMachineList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*v1beta1.IBMPowerVSMachineList)
+
+	return Convert_v1beta1_IBMPowerVSMachineList_To_v1alpha4_IBMPowerVSMachineList(src, dst, nil)
+}
+
+func (src *IBMPowerVSMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*v1beta1.IBMPowerVSMachineTemplate)
+
+	return Convert_v1alpha4_IBMPowerVSMachineTemplate_To_v1beta1_IBMPowerVSMachineTemplate(src, dst, nil)
+}
+
+func (dst *IBMPowerVSMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*v1beta1.IBMPowerVSMachineTemplate)
+
+	return Convert_v1beta1_IBMPowerVSMachineTemplate_To_v1alpha4_IBMPowerVSMachineTemplate(src, dst, nil)
+}
+
+func (src *IBMPowerVSMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*v1beta1.IBMPowerVSMachineTemplateList)
+
+	return Convert_v1alpha4_IBMPowerVSMachineTemplateList_To_v1beta1_IBMPowerVSMachineTemplateList(src, dst, nil)
+}
+
+func (dst *IBMPowerVSMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*v1beta1.IBMPowerVSMachineTemplateList)
+
+	return Convert_v1beta1_IBMPowerVSMachineTemplateList_To_v1alpha4_IBMPowerVSMachineTemplateList(src, dst, nil)
+}