CAPI 1.11

Makefile

@@ -64,7 +64,7 @@ export PATH := $(TOOLS_BIN_DIR):$(PATH)
 OUTPUT_BASE := --output-base=$(ROOT_DIR)
 
 # the current cluster API version
-CAPI_VERSION := v1.10.3
+CAPI_VERSION := v1.11.1
 
 # Binaries.
 GO_INSTALL = ./scripts/go_install.sh
@@ -74,24 +74,24 @@ CLUSTERCTL_VER := $(CAPI_VERSION)
 CLUSTERCTL_BIN := clusterctl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)
 
-CONTROLLER_GEN_VER := v0.17.2
+CONTROLLER_GEN_VER := v0.19.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
 
-CONVERSION_GEN_VER := v0.30.0
+CONVERSION_GEN_VER := v0.34.0
 CONVERSION_GEN_BIN := conversion-gen
 CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
 
 ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
 ENVSUBST_BIN := envsubst
 ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-$(ENVSUBST_VER)
 
-GOLANGCI_LINT_VER := v2.2.2
+GOLANGCI_LINT_VER := v2.4.0
 GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
 GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
-KUSTOMIZE_VER := v5.6.0
+KUSTOMIZE_VER := v5.7.0
 KUSTOMIZE_BIN := kustomize
 KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
 
@@ -103,15 +103,15 @@ RELEASE_NOTES_VER := v0.12.0
 RELEASE_NOTES_BIN := release-notes
 RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
 
-GO_APIDIFF_VER := v0.8.2
+GO_APIDIFF_VER := v0.8.3
 GO_APIDIFF_BIN := go-apidiff
 GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)
 
 GINKGO_VER := v2.19.0
 GINKGO_BIN := ginkgo
 GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
 
-KUBECTL_VER := v1.31.0
+KUBECTL_VER := v1.32.6
 KUBECTL_BIN := kubectl
 KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
 
@@ -123,16 +123,16 @@ SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST
 #
 # Kubebuilder 
 #
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.26.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.6
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 
 KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
 
 # Version
 MAJOR_VER ?= 1
-MINOR_VER ?= 1
-PATCH_VER ?= 21
+MINOR_VER ?= 2
+PATCH_VER ?= 0
 
 # Define Docker related variables. Releases should modify and double check these vars.
 REGISTRY ?= mocimages.azurecr.io
@@ -291,14 +291,21 @@ generate: ## Generate code
 .PHONY: generate-go
 generate-go: $(CONTROLLER_GEN) $(MOCKGEN) $(CONVERSION_GEN) ## Runs Go related generate targets
 	go generate ./...
+	$(CONTROLLER_GEN) \
+		paths=./api/v1beta2 \
+		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
 	$(CONTROLLER_GEN) \
 		paths=./api/v1beta1 \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
+	$(CONVERSION_GEN) \
+		--output-file zz_generated.conversion.go \
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt \
+		./api/v1beta1
 
 .PHONY: generate-manifests
 generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 	$(CONTROLLER_GEN) \
-		paths=./api/v1beta1 \
+		paths="./api/v1beta1;./api/v1beta2" \
 		crd:crdVersions=v1 \
 		rbac:roleName=manager-role \
 		output:crd:dir=$(CRD_ROOT) \

PROJECT

@@ -46,4 +46,19 @@ resources:
 - group: infrastructure
   kind: AzureStackHCILoadBalancer
   version: v1beta1
+- group: infrastructure
+  kind: AzureStackHCICluster
+  version: v1beta2
+- group: infrastructure
+  kind: AzureStackHCIMachine
+  version: v1beta2
+- group: infrastructure
+  kind: AzureStackHCIMachineTemplate
+  version: v1beta2
+- group: infrastructure
+  kind: AzureStackHCIVirtualMachine
+  version: v1beta2
+- group: infrastructure
+  kind: AzureStackHCILoadBalancer
+  version: v1beta2
 version: "3"

api/v1beta1/azurestackhcicluster_conversion.go

@@ -17,8 +17,32 @@ limitations under the License.
 
 package v1beta1
 
-// Hub marks AzureStackHCICluster as a conversion hub.
-func (*AzureStackHCICluster) Hub() {}
+import (
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-// Hub marks AzureStackHCIClusterList as a conversion hub.
-func (*AzureStackHCIClusterList) Hub() {}
+	infrav1beta2 "github.com/microsoft/cluster-api-provider-azurestackhci/api/v1beta2"
+)
+
+// ConvertTo converts this v1beta1 AzureStackHCICluster to the Hub version (v1beta2).
+func (src *AzureStackHCICluster) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCICluster)
+	return Convert_v1beta1_AzureStackHCICluster_To_v1beta2_AzureStackHCICluster(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCICluster.
+func (dst *AzureStackHCICluster) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCICluster)
+	return Convert_v1beta2_AzureStackHCICluster_To_v1beta1_AzureStackHCICluster(src, dst, nil)
+}
+
+// ConvertTo converts this v1beta1 AzureStackHCIClusterList to the Hub version (v1beta2).
+func (src *AzureStackHCIClusterList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIClusterList)
+	return Convert_v1beta1_AzureStackHCIClusterList_To_v1beta2_AzureStackHCIClusterList(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIClusterList.
+func (dst *AzureStackHCIClusterList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIClusterList)
+	return Convert_v1beta2_AzureStackHCIClusterList_To_v1beta1_AzureStackHCIClusterList(src, dst, nil)
+}

api/v1beta1/azurestackhcicluster_types.go

@@ -19,7 +19,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 const (
@@ -93,7 +93,6 @@ func (c *AzureStackHCIClusterStatus) GetTypedPhase() AzureStackHCIClusterPhase {
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=azurestackhciclusters,scope=Namespaced,categories=cluster-api
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="AzureStackHCICluster status such as Pending/Provisioning/Provisioned/Deleting/Failed"
 
 // AzureStackHCICluster is the Schema for the azurestackhciclusters API

api/v1beta1/azurestackhciloadbalancer_conversion.go

@@ -17,8 +17,32 @@ limitations under the License.
 
 package v1beta1
 
-// Hub marks AzureStackHCILoadBalancer as a conversion hub.
-func (*AzureStackHCILoadBalancer) Hub() {}
+import (
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-// Hub marks AzureStackHCILoadBalancerList as a conversion hub.
-func (*AzureStackHCILoadBalancerList) Hub() {}
+	infrav1beta2 "github.com/microsoft/cluster-api-provider-azurestackhci/api/v1beta2"
+)
+
+// ConvertTo converts this v1beta1 AzureStackHCILoadBalancer to the Hub version (v1beta2).
+func (src *AzureStackHCILoadBalancer) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCILoadBalancer)
+	return Convert_v1beta1_AzureStackHCILoadBalancer_To_v1beta2_AzureStackHCILoadBalancer(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCILoadBalancer.
+func (dst *AzureStackHCILoadBalancer) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCILoadBalancer)
+	return Convert_v1beta2_AzureStackHCILoadBalancer_To_v1beta1_AzureStackHCILoadBalancer(src, dst, nil)
+}
+
+// ConvertTo converts this v1beta1 AzureStackHCILoadBalancerList to the Hub version (v1beta2).
+func (src *AzureStackHCILoadBalancerList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCILoadBalancerList)
+	return Convert_v1beta1_AzureStackHCILoadBalancerList_To_v1beta2_AzureStackHCILoadBalancerList(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCILoadBalancerList.
+func (dst *AzureStackHCILoadBalancerList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCILoadBalancerList)
+	return Convert_v1beta2_AzureStackHCILoadBalancerList_To_v1beta1_AzureStackHCILoadBalancerList(src, dst, nil)
+}

api/v1beta1/azurestackhciloadbalancer_types.go

@@ -19,7 +19,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
 )
 
@@ -148,7 +148,6 @@ func (c *AzureStackHCILoadBalancerStatus) GetTypedPhase() AzureStackHCILoadBalan
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=azurestackhciloadbalancers,scope=Namespaced,categories=cluster-api
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="The current phase/status of the loadbalancer"
 // +kubebuilder:printcolumn:name="IP",type="string",JSONPath=".status.address",description="The frontend VIP address assigned to the loadbalancer"

api/v1beta1/azurestackhcimachine_conversion.go

@@ -17,8 +17,32 @@ limitations under the License.
 
 package v1beta1
 
-// Hub marks AzureStackHCIMachine as a conversion hub.
-func (*AzureStackHCIMachine) Hub() {}
+import (
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-// Hub marks AzureStackHCIMachineList as a conversion hub.
-func (*AzureStackHCIMachineList) Hub() {}
+	infrav1beta2 "github.com/microsoft/cluster-api-provider-azurestackhci/api/v1beta2"
+)
+
+// ConvertTo converts this v1beta1 AzureStackHCIMachine to the Hub version (v1beta2).
+func (src *AzureStackHCIMachine) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIMachine)
+	return Convert_v1beta1_AzureStackHCIMachine_To_v1beta2_AzureStackHCIMachine(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIMachine.
+func (dst *AzureStackHCIMachine) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIMachine)
+	return Convert_v1beta2_AzureStackHCIMachine_To_v1beta1_AzureStackHCIMachine(src, dst, nil)
+}
+
+// ConvertTo converts this v1beta1 AzureStackHCIMachineList to the Hub version (v1beta2).
+func (src *AzureStackHCIMachineList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIMachineList)
+	return Convert_v1beta1_AzureStackHCIMachineList_To_v1beta2_AzureStackHCIMachineList(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIMachineList.
+func (dst *AzureStackHCIMachineList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIMachineList)
+	return Convert_v1beta2_AzureStackHCIMachineList_To_v1beta1_AzureStackHCIMachineList(src, dst, nil)
+}

api/v1beta1/azurestackhcimachine_types.go

@@ -20,7 +20,7 @@ package v1beta1
 import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
 )
 
@@ -127,7 +127,6 @@ type AzureStackHCIMachineStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=azurestackhcimachines,scope=Namespaced,categories=cluster-api
-// +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 
 // AzureStackHCIMachine is the Schema for the azurestackhcimachines API

api/v1beta1/azurestackhcimachinetemplate_conversion.go

@@ -17,8 +17,32 @@ limitations under the License.
 
 package v1beta1
 
-// Hub marks AzureStackHCIMachineTemplate as a conversion hub.
-func (*AzureStackHCIMachineTemplate) Hub() {}
+import (
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-// Hub marks AzureStackHCIMachineTemplateList as a conversion hub.
-func (*AzureStackHCIMachineTemplateList) Hub() {}
+	infrav1beta2 "github.com/microsoft/cluster-api-provider-azurestackhci/api/v1beta2"
+)
+
+// ConvertTo converts this v1beta1 AzureStackHCIMachineTemplate to the Hub version (v1beta2).
+func (src *AzureStackHCIMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIMachineTemplate)
+	return Convert_v1beta1_AzureStackHCIMachineTemplate_To_v1beta2_AzureStackHCIMachineTemplate(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIMachineTemplate.
+func (dst *AzureStackHCIMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIMachineTemplate)
+	return Convert_v1beta2_AzureStackHCIMachineTemplate_To_v1beta1_AzureStackHCIMachineTemplate(src, dst, nil)
+}
+
+// ConvertTo converts this v1beta1 AzureStackHCIMachineTemplateList to the Hub version (v1beta2).
+func (src *AzureStackHCIMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIMachineTemplateList)
+	return Convert_v1beta1_AzureStackHCIMachineTemplateList_To_v1beta2_AzureStackHCIMachineTemplateList(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIMachineTemplateList.
+func (dst *AzureStackHCIMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIMachineTemplateList)
+	return Convert_v1beta2_AzureStackHCIMachineTemplateList_To_v1beta1_AzureStackHCIMachineTemplateList(src, dst, nil)
+}

api/v1beta1/azurestackhcimachinetemplate_types.go

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

api/v1beta1/azurestackhcivirtualmachine_conversion.go

@@ -17,8 +17,32 @@ limitations under the License.
 
 package v1beta1
 
-// Hub marks AzureStackHCIVirtualMachine as a conversion hub.
-func (*AzureStackHCIVirtualMachine) Hub() {}
+import (
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
-// Hub marks AzureStackHCIVirtualMachineList as a conversion hub.
-func (*AzureStackHCIVirtualMachineList) Hub() {}
+	infrav1beta2 "github.com/microsoft/cluster-api-provider-azurestackhci/api/v1beta2"
+)
+
+// ConvertTo converts this v1beta1 AzureStackHCIVirtualMachine to the Hub version (v1beta2).
+func (src *AzureStackHCIVirtualMachine) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIVirtualMachine)
+	return Convert_v1beta1_AzureStackHCIVirtualMachine_To_v1beta2_AzureStackHCIVirtualMachine(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIVirtualMachine.
+func (dst *AzureStackHCIVirtualMachine) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIVirtualMachine)
+	return Convert_v1beta2_AzureStackHCIVirtualMachine_To_v1beta1_AzureStackHCIVirtualMachine(src, dst, nil)
+}
+
+// ConvertTo converts this v1beta1 AzureStackHCIVirtualMachineList to the Hub version (v1beta2).
+func (src *AzureStackHCIVirtualMachineList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*infrav1beta2.AzureStackHCIVirtualMachineList)
+	return Convert_v1beta1_AzureStackHCIVirtualMachineList_To_v1beta2_AzureStackHCIVirtualMachineList(src, dst, nil)
+}
+
+// ConvertFrom converts from the Hub version (v1beta2) to this v1beta1 AzureStackHCIVirtualMachineList.
+func (dst *AzureStackHCIVirtualMachineList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*infrav1beta2.AzureStackHCIVirtualMachineList)
+	return Convert_v1beta2_AzureStackHCIVirtualMachineList_To_v1beta1_AzureStackHCIVirtualMachineList(src, dst, nil)
+}

api/v1beta1/azurestackhcivirtualmachine_types.go

@@ -20,7 +20,7 @@ package v1beta1
 import (
 	v1core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	"sigs.k8s.io/cluster-api/errors"
 )
 
@@ -92,7 +92,6 @@ type AzureStackHCIVirtualMachineStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:path=azurestackhcivirtualmachines,scope=Namespaced,categories=cluster-api
 // +kubebuilder:subresource:status
-// +kubebuilder:storageversion
 
 // AzureStackHCIVirtualMachine is the Schema for the azurestackhcivirtualmachines API
 type AzureStackHCIVirtualMachine struct {

api/v1beta1/conditions_consts.go

@@ -17,7 +17,7 @@ limitations under the License.
 
 package v1beta1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 // Conditions and condition Reasons for the AzureStackHCIVirtualMachine object