v1alpha2 wip (do not merge)

.codespellignore

@@ -1,4 +1,5 @@
 capi
 proxmox
 capmox
-decorder
+decorder
+nd

.custom-gcl.yml

@@ -0,0 +1,6 @@
+version: v2.9.0
+name: golangci-lint-custom
+destination: ./bin
+plugins:
+  - module: 'sigs.k8s.io/kube-api-linter'
+    version: v0.0.0-20260206102632-39e3d06a2850

.github/workflows/lint.yml

@@ -16,11 +16,10 @@ jobs:
       - uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
+      - name: build custom golangci-lint with kube-api-linter module
+        run: go run -modfile ./hack/tools/go.mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint custom
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9
-        with:
-          version: v2.1.6
-          args: '--timeout 10m'
+        run: ./bin/golangci-lint-custom run --timeout 10m
 
   yamllint:
     name: yamllint

.golangci.yml

@@ -18,6 +18,7 @@ linters:
     - govet
     - importas
     - ineffassign
+    - kubeapilinter
     - loggercheck
     - misspell
     - nakedret
@@ -31,6 +32,11 @@ linters:
     - unused
     - whitespace
   settings:
+    custom:
+      kubeapilinter:
+        type: module
+        description: Kube API Linter lints Kube like APIs based on API conventions and best practices.
+        settings: {}
     importas:
       alias:
         - pkg: k8s.io/api/(\w+)/(v[\w\d]+)
@@ -84,13 +90,15 @@ linters:
       - linters:
           - staticcheck
         text: QF100(2|3|8)
+      - linters:
+          - staticcheck
+        text: ST1001
+      - linters:
+          - revive
+        text: dot-imports
       - linters:
           - unparam
         text: always receives
-      - path: _test\.go
-        text: should not use dot imports
-      - path: (framework|e2e)/.*.go
-        text: should not use dot imports
       - path: _test\.go
         text: cyclomatic complexity
       - linters:
@@ -108,6 +116,17 @@ linters:
       - linters:
           - revive
         text: 'var-naming: avoid meaningless package names'
+      - path-except: api/v1alpha2
+        linters:
+          - kubeapilinter
+      - path: (.+)\.go$
+        linters:
+          - staticcheck
+        text: '(SA1019): "sigs.k8s.io/cluster-api/.*/v1beta1.*" is deprecated: .*'
+      - path: (.+)\.go$
+        linters:
+          - staticcheck
+        text: '(SA1019): "sigs.k8s.io/cluster-api/errors" is deprecated: .*'
     paths:
       - zz_generated.*\.go$
       - .*conversion.*\.go$
@@ -117,7 +136,6 @@ linters:
       - examples$
 issues:
   max-issues-per-linter: 0
-  max-same-issues: 0
 formatters:
   enable:
     - gofmt

.yamllint

@@ -27,6 +27,8 @@ ignore:
 - config/certmanager
 - config/prometheus
 - config/rbac
+- config/manager
+- config/default
 - test/e2e
 - out
 - .*.yaml

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.24 AS builder
+FROM golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
@@ -16,6 +16,7 @@ COPY cmd/main.go cmd/main.go
 COPY api/ api/
 COPY internal/ internal/
 COPY pkg/ pkg/
+COPY capiv1beta1/ capiv1beta1/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.30.0
+ENVTEST_K8S_VERSION = 1.33.0
 
 TOOLS_DIR := hack/tools
 
@@ -45,8 +45,11 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: generate
-generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+generate: controller-gen conversion-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object paths="./..."
+	$(CONVERSION_GEN) \
+		--output-file=zz_generated.conversion.go \
+		./api/v1alpha1
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
@@ -58,7 +61,8 @@ vet: ## Run go vet against code.
 
 .PHONY: lint
 lint: ## Run lint.
-	go run -modfile ./hack/tools/go.mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint run
+	go run -modfile ./hack/tools/go.mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint custom
+	./bin/golangci-lint-custom run
 
 # Package names to test
 WHAT ?= ./...
@@ -180,8 +184,12 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.0.0
-CONTROLLER_TOOLS_VERSION ?= v0.16.5
-ENVTEST_VERSION ?= 42a14a36c13b95dd6bc8b4ba69c181b16d50e3c0 # last version to support go1.24
+CONTROLLER_TOOLS_VERSION ?= v0.18.0
+ENVTEST_VERSION ?= 42a14a36c13b95dd6bc8b4ba69c181b16d50e3c0 # last version to support go1.24, don't update until we're on k8s/0.34
+
+## Conversion gen
+CONVERSION_GEN_VER := v0.33.3
+CONVERSION_GEN := $(LOCALBIN)/conversion-gen
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
 .PHONY: kustomize
@@ -199,6 +207,12 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 	test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
 	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
 
+.PHONY: conversion-gen
+conversion-gen: $(CONVERSION_GEN) ## Download conversion-gen locally if necessary. If wrong version is installed, it will be overwritten.
+$(CONVERSION_GEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/conversion-gen && $(LOCALBIN)/conversion-gen | grep -q $(CONVERSION_GEN_VER) || \
+	GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/conversion-gen@$(CONVERSION_GEN_VER)
+
 .PHONY: envtest
 envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)

PROJECT

@@ -50,4 +50,33 @@ resources:
   kind: ProxmoxClusterTemplate
   path: github.com/ionos-cloud/cluster-api-provider-proxmox/api/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cluster.x-k8s.io
+  group: infrastructure
+  kind: ProxmoxMachine
+  path: github.com/ionos-cloud/cluster-api-provider-proxmox/api/v1alpha2
+  version: v1alpha2
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: cluster.x-k8s.io
+  group: infrastructure
+  kind: ProxmoxCluster
+  path: github.com/ionos-cloud/cluster-api-provider-proxmox/api/v1alpha2
+  version: v1alpha2
+  webhooks:
+    defaulting: true
+    validation: true
+    webhookVersion: v2
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: cluster.x-k8s.io
+  group: infrastructure
+  kind: ProxmoxMachineTemplate
+  path: github.com/ionos-cloud/cluster-api-provider-proxmox/api/v1alpha2
+  version: v1alpha2
 version: "3"

README.md

@@ -16,15 +16,27 @@ Check out the [quickstart guide](./docs/Usage.md#quick-start) for launching a cl
 ## Compatibility with Cluster API and Kubernetes Versions
 This provider's versions are compatible with the following versions of Cluster API:
 
-|                        | Cluster API v1beta1 (v1.4) | Cluster API v1beta1 (v1.5) | Cluster API v1beta1 (v1.6) | Cluster API v1beta1 (v1.7) | Cluster API v1beta1 (v1.8) | Cluster API v1beta1 (v1.9) |
-|------------------------|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|:--------------------------:|
-| CAPMOX v1alpha1 (v0.1) |             ✓              |             ✓              |             ☓              |             ☓              |             ☓              |             ☓              |
-| CAPMOX v1alpha1 (v0.2) |             ☓              |             ✓              |             ✓              |             ☓              |             ☓              |             ☓              |
-| CAPMOX v1alpha1 (v0.3) |             ☓              |             ✓              |             ✓              |             ✓              |             ☓              |             ☓              |
-| CAPMOX v1alpha1 (v0.4) |             ☓              |             ✓              |             ✓              |             ✓              |             ☓              |             ☓              |
-| CAPMOX v1alpha1 (v0.5) |             ☓              |             ☓              |             ✓              |             ✓              |             ☓              |             ☓              |
-| CAPMOX v1alpha1 (v0.6) |             ☓              |             ☓              |             ☓              |             ✓              |             ✓              |             ☓              |
-| CAPMOX v1alpha1 (v0.7) |             ☓              |             ☓              |             ☓              |             ☓              |             ✓              |             ✓              |
+### CAPMOX v1alpha2 (current)
+
+Cluster API v1beta2
+
+|             | CAPI v1.11 |
+|-------------|:----------:|
+| CAPMOX v0.8 |     ✓      |
+
+### CAPMOX v1alpha1 (obsolete)
+
+Cluster API v1beta1
+
+|             | CAPI v1.4 | CAPI v1.5 | CAPI v1.6 | CAPI v1.7 | CAPI v1.8 | CAPI v1.9 | CAPI v1.10 |
+|-------------|:---------:|:---------:|:---------:|:---------:|:---------:|:---------:|:----------:|
+| CAPMOX v0.1 |     ✓     |     ✓     |     ☓     |     ☓     |     ☓     |     ☓     |      ☓     |
+| CAPMOX v0.2 |     ☓     |     ✓     |     ✓     |     ☓     |     ☓     |     ☓     |      ☓     |
+| CAPMOX v0.3 |     ☓     |     ✓     |     ✓     |     ✓     |     ☓     |     ☓     |      ☓     |
+| CAPMOX v0.4 |     ☓     |     ✓     |     ✓     |     ✓     |     ☓     |     ☓     |      ☓     |
+| CAPMOX v0.5 |     ☓     |     ☓     |     ✓     |     ✓     |     ☓     |     ☓     |      ☓     |
+| CAPMOX v0.6 |     ☓     |     ☓     |     ☓     |     ✓     |     ✓     |     ☓     |      ☓     |
+| CAPMOX v0.7 |     ☓     |     ☓     |     ☓     |     ☓     |     ✓     |     ✓     |      ✓     |
 
 (See [Kubernetes support matrix](https://cluster-api.sigs.k8s.io/reference/versions.html) of Cluster API versions).
 

api/v1alpha1/conditions_consts.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package v1alpha1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+import clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 
 const (
 	// VMProvisionedCondition documents the status of the provisioning of a ProxmoxMachine and its underlying ProxmoxVM.