Merge pull request #56 from leaseweb/develop

Refactor all controllers, add CAPI clusterclass support add conditions

Author: hrak

.github/workflows/go-coverage.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - name: Run go test with coverage
         run: COVER_PROFILE=coverage.txt make test
       - name: Codecov upload

.github/workflows/pr-check.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Install Go 1.x
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
 
       - name: Run unit tests
         run: make lint
@@ -31,7 +31,7 @@ jobs:
       - name: Install Go 1.x
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
 
       - name: Cache
         uses: actions/cache@v4

.golangci.yml

@@ -160,7 +160,7 @@ linters:
 
 run:
   timeout: 10m
-  go: "1.22"
+  go: "1.23"
   build-tags:
     - tools
     - e2e
@@ -200,5 +200,9 @@ issues:
         - stylecheck
       text: "ST1003: should not use underscores in Go names;"
       path: api\/.*\/.*conversion.*\.go$
+      # Ignore non-constant format string in call to condition utils
+    - linters:
+        - govet
+      text: "non-constant format string in call to sigs\\.k8s\\.io\\/cluster-api\\/util\\/conditions\\."
   exclude-files:
     - "zz_generated.*\\.go$"

Makefile

@@ -63,7 +63,7 @@ GOTESTSUM_BIN := gotestsum
 GOTESTSUM := $(abspath $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER))
 GOTESTSUM_PKG := gotest.tools/gotestsum
 
-CONVERSION_GEN_VER := v0.30.0
+CONVERSION_GEN_VER := v0.30.10
 CONVERSION_GEN_BIN := conversion-gen
 # We are intentionally using the binary without version suffix, to avoid the version
 # in generated files.
@@ -91,9 +91,9 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT
 GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
 
 MOCKGEN_BIN := mockgen
-MOCKGEN_VER := v1.6.0
+MOCKGEN_VER := v0.5.0
 MOCKGEN := $(abspath $(TOOLS_BIN_DIR)/$(MOCKGEN_BIN)-$(MOCKGEN_VER))
-MOCKGEN_PKG := github.com/golang/mock/mockgen
+MOCKGEN_PKG := go.uber.org/mock/mockgen
 
 KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 
@@ -177,8 +177,8 @@ lint: $(GOLANGCI_LINT) generate-mocks ## Run linting for the project.
 
 .PHONY: modules
 modules: ## Runs go mod to ensure proper vendoring.
-	go mod tidy -compat=1.22
-	cd $(TOOLS_DIR); go mod tidy -compat=1.22
+	go mod tidy -compat=1.23
+	cd $(TOOLS_DIR); go mod tidy -compat=1.23
 
 .PHONY: generate-all
 generate-all: generate-mocks generate-conversion generate-deepcopy generate-manifests
@@ -193,17 +193,17 @@ DEEPCOPY_GEN_INPUTS=$(shell find ./api -name "*test*" -prune -o -name "*zz_gener
 .PHONY: generate-deepcopy
 generate-deepcopy: $(DEEPCOPY_GEN_TARGETS) ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 api/%/zz_generated.deepcopy.go: $(CONTROLLER_GEN) $(DEEPCOPY_GEN_INPUTS)
-	CGO_ENABLED=0 $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	CGO_ENABLED=0 $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
 
-MANIFEST_GEN_INPUTS=$(shell find ./api ./controllers -type f -name "*test*" -prune -o -name "*zz_generated*" -prune -o -print)
+MANIFEST_GEN_INPUTS=$(shell find ./api ./internal/controllers -type f -name "*test*" -prune -o -name "*zz_generated*" -prune -o -print)
 # Using a flag file here as config output is too complicated to be a target.
 # The following triggers manifest building if $(IMG) differs from that found in config/default/manager_image_patch.yaml.
 $(shell	grep -qs "$(IMG)" config/default/manager_image_patch_edited.yaml || rm -f config/.flag.mk)
 .PHONY: generate-manifests
 generate-manifests: config/.flag.mk ## Generates crd, webhook, rbac, and other configuration manifests from kubebuilder instructions in go comments.
 config/.flag.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS)
 	sed -e 's@image: .*@image: '"$(IMG)"'@' config/default/manager_image_patch.yaml > config/default/manager_image_patch_edited.yaml
-	$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="{./,./api/...,./controllers/...}" output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="{./,./api/...,./internal/controllers/...}" output:crd:artifacts:config=config/crd/bases
 	@touch config/.flag.mk
 
 .PHONY: generate-conversion
@@ -222,7 +222,7 @@ generate-conversion: $(CONVERSION_GEN) ## Generate code to convert api/v1beta1 a
 ## Build
 ## --------------------------------------
 
-MANAGER_BIN_INPUTS=$(shell find ./controllers ./api ./pkg -name "*mock*" -prune -o -name "*test*" -prune -o -type f -print) main.go go.mod go.sum
+MANAGER_BIN_INPUTS=$(shell find ./internal/controllers ./api ./pkg -name "*mock*" -prune -o -name "*test*" -prune -o -type f -print) main.go go.mod go.sum
 .PHONY: build
 build: binaries generate-deepcopy generate-manifests release-manifests ## Build manager binary.
 $(BIN_DIR)/manager: $(MANAGER_BIN_INPUTS)
@@ -261,7 +261,7 @@ undeploy: $(KUSTOMIZE) ## Undeploy controller from the K8s cluster specified in
 # Using a flag file here as docker build doesn't produce a target file.
 DOCKER_BUILD_INPUTS=$(MANAGER_BIN_INPUTS) Dockerfile
 .PHONY: docker-build
-docker-build: generate-deepcopy generate-conversion build-for-docker .dockerflag.mk ## Build docker image containing the controller manager.
+docker-build: generate-deepcopy generate-conversion generate-mocks build-for-docker .dockerflag.mk ## Build docker image containing the controller manager.
 .dockerflag.mk: $(DOCKER_BUILD_INPUTS)
 	docker build -t ${IMG} .
 	@touch .dockerflag.mk
@@ -304,28 +304,14 @@ cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
 
 KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
 
-DEEPCOPY_GEN_TARGETS_TEST=$(shell find test/fakes -type d -name "fakes" -exec echo {}\/zz_generated.deepcopy.go \;)
-DEEPCOPY_GEN_INPUTS_TEST=$(shell find test/fakes/* -name "*zz_generated*" -prune -o -type f -print)
-.PHONY: generate-deepcopy-test
-generate-deepcopy-test: $(DEEPCOPY_GEN_TARGETS_TEST) ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-test/fakes/zz_generated.deepcopy.go: $(CONTROLLER_GEN) $(DEEPCOPY_GEN_INPUTS_TEST)
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
-
-MANIFEST_GEN_INPUTS_TEST=$(shell find test/fakes/* -name "*zz_generated*" -prune -o -type f -print)
-.PHONY: generate-manifest-test
-generate-manifest-test: config/.flag-test.mk ## Generates crd, webhook, rbac, and other configuration manifests from kubebuilder instructions in go comments.
-config/.flag-test.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS_TEST)
-	$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="./test/fakes" output:crd:artifacts:config=test/fakes
-	@touch config/.flag-test.mk
-
 .PHONY: setup-envtest
 setup-envtest: $(SETUP_ENVTEST) ## Set up envtest (download kubebuilder assets)
 	@echo KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS)
 
 .PHONY: test
-test: ## Run tests.
-test: generate-deepcopy-test generate-manifest-test generate-mocks setup-envtest $(GINKGO)
-	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" $(GINKGO) --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...
+test: generate-mocks setup-envtest $(GINKGO)
+	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" $(GINKGO) --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./pkg/...
+	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -v -coverprofile cover.out ./internal/controllers/...
 
 .PHONY: test-pkg
 test-pkg: $(GINKGO)  ## Run pkg tests.
@@ -371,7 +357,7 @@ clean: ## Cleans up everything.
 	rm -rf $(TOOLS_BIN_DIR)
 	rm -rf cluster-api
 	rm -rf test/e2e/data/infrastructure-cloudstack/*/*yaml
-	rm -rf config/.flag.mk config/.flag-test.mk .dockerflag.mk
+	rm -rf config/.flag.mk .dockerflag.mk
 
 ##@ Release
 ## --------------------------------------

PROJECT

@@ -18,6 +18,19 @@ resources:
     defaulting: true
     validation: true
     webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: cluster.x-k8s.io
+  group: infrastructure
+  kind: CloudStackClusterTemplate
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3
+  version: v1beta3
+  webhooks:
+    defaulting: true
+    validation: true
+    webhookVersion: v1
 - api:
     crdVersion: v1
     namespaced: true

api/v1beta1/zz_generated.conversion.go

@@ -17,8 +17,11 @@ limitations under the License.
 package v1beta2
 
 import (
+	unsafe "unsafe"
+
 	machineryconversion "k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/utils/ptr"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
@@ -57,3 +60,10 @@ func Convert_v1beta2_CloudStackClusterSpec_To_v1beta3_CloudStackClusterSpec(in *
 
 	return nil
 }
+
+func Convert_v1beta3_CloudStackClusterStatus_To_v1beta2_CloudStackClusterStatus(in *v1beta3.CloudStackClusterStatus, out *CloudStackClusterStatus, _ machineryconversion.Scope) error {
+	out.FailureDomains = *(*clusterv1.FailureDomains)(unsafe.Pointer(&in.FailureDomains))
+	out.Ready = in.Ready
+
+	return nil
+}

api/v1beta2/cloudstackcluster_conversion.go

@@ -17,6 +17,9 @@ limitations under the License.
 package v1beta2
 
 import (
+	unsafe "unsafe"
+
+	corev1 "k8s.io/api/core/v1"
 	machineryconversion "k8s.io/apimachinery/pkg/conversion"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
@@ -64,9 +67,40 @@ func (r *CloudStackMachine) ConvertFrom(srcRaw conversion.Hub) error {
 }
 
 func Convert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec(in *v1beta3.CloudStackMachineSpec, out *CloudStackMachineSpec, s machineryconversion.Scope) error {
+	if in.DiskOffering != nil {
+		out.DiskOffering = CloudStackResourceDiskOffering{
+			CustomSize: in.DiskOffering.CustomSize,
+			MountPath:  in.DiskOffering.MountPath,
+			Device:     in.DiskOffering.Device,
+			Filesystem: in.DiskOffering.Filesystem,
+			Label:      in.DiskOffering.Label,
+		}
+	}
+
 	return autoConvert_v1beta3_CloudStackMachineSpec_To_v1beta2_CloudStackMachineSpec(in, out, s)
 }
 
 func Convert_v1beta2_CloudStackMachineSpec_To_v1beta3_CloudStackMachineSpec(in *CloudStackMachineSpec, out *v1beta3.CloudStackMachineSpec, s machineryconversion.Scope) error {
+	if in.DiskOffering != (CloudStackResourceDiskOffering{}) {
+		out.DiskOffering = &v1beta3.CloudStackResourceDiskOffering{
+			CustomSize: in.DiskOffering.CustomSize,
+			MountPath:  in.DiskOffering.MountPath,
+			Device:     in.DiskOffering.Device,
+			Filesystem: in.DiskOffering.Filesystem,
+			Label:      in.DiskOffering.Label,
+		}
+	}
+
 	return autoConvert_v1beta2_CloudStackMachineSpec_To_v1beta3_CloudStackMachineSpec(in, out, s)
 }
+
+func Convert_v1beta3_CloudStackMachineStatus_To_v1beta2_CloudStackMachineStatus(in *v1beta3.CloudStackMachineStatus, out *CloudStackMachineStatus, _ machineryconversion.Scope) error {
+	out.Ready = in.Ready
+	out.Addresses = *(*[]corev1.NodeAddress)(unsafe.Pointer(&in.Addresses))
+	out.InstanceState = in.InstanceState
+	out.InstanceStateLastUpdated = in.InstanceStateLastUpdated
+	out.Status = (*string)(unsafe.Pointer(in.Status))
+	out.Reason = (*string)(unsafe.Pointer(in.Reason))
+
+	return nil
+}

api/v1beta2/cloudstackmachine_conversion.go

@@ -30,6 +30,10 @@ var K8sClient client.Client
 
 // CloudStackClusterSpec defines the desired state of CloudStackCluster.
 type CloudStackClusterSpec struct {
+	// FailureDomains is a list of failure domains for the cluster.
+	//+listType=map
+	//+listMapKey=name
+	//+listMapKeyType=string
 	FailureDomains []CloudStackFailureDomainSpec `json:"failureDomains"`
 
 	// The kubernetes control plane endpoint.
@@ -51,11 +55,28 @@ type CloudStackClusterStatus struct {
 	// Reflects the readiness of the CS cluster.
 	//+optional
 	Ready bool `json:"ready"`
+
+	// Conditions defines current service state of the CloudStackCluster.
+	//+optional
+	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
 }
 
-//+kubebuilder:object:root=true
+// GetConditions returns the conditions for the CloudStackCluster.
+func (r *CloudStackCluster) GetConditions() clusterv1.Conditions {
+	return r.Status.Conditions
+}
+
+// SetConditions sets the conditions for the CloudStackCluster.
+func (r *CloudStackCluster) SetConditions(conditions clusterv1.Conditions) {
+	r.Status.Conditions = conditions
+}
+
+//+kubebuilder:resource:path=cloudstackclusters,scope=Namespaced,categories=cluster-api,shortName=cscluster
 //+kubebuilder:subresource:status
 //+kubebuilder:storageversion
+//+kubebuilder:object:root=true
+//+kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels['cluster\\.x-k8s\\.io/cluster-name']",description="Cluster"
+//+kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of CloudStackCluster"
 
 // CloudStackCluster is the Schema for the cloudstackclusters API.
 type CloudStackCluster struct {