✨ v1.2.x with APIVersion v1beta2

.envrc.sample

@@ -6,8 +6,8 @@ export HCLOUD_REGION=fsn1
 export CONTROL_PLANE_MACHINE_COUNT=1
 export WORKER_MACHINE_COUNT=1
 export KUBERNETES_VERSION=v1.33.6
-export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx31
-export HCLOUD_WORKER_MACHINE_TYPE=cpx31
+export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx32
+export HCLOUD_WORKER_MACHINE_TYPE=cpx32
 export SSH_KEY=$HOME/.ssh/my-caph-ssh-key.pub
 export HETZNER_SSH_PUB_PATH=$HOME/.ssh/my-caph-ssh-key.pub
 export HETZNER_SSH_PRIV_PATH=$HOME/.ssh/my-caph-ssh-key

.golangci.yaml

@@ -77,9 +77,9 @@ linters-settings:
         alias: ctrl
       - pkg: k8s.io/apimachinery/pkg/util/runtime
         alias: utilruntime
-      - pkg: sigs.k8s.io/cluster-api/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/v1beta2
         alias: clusterv1
-      - pkg: sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
+      - pkg: sigs.k8s.io/cluster-api/api/bootstrap/kubeadm/v1beta2
         alias: bootstrapv1
       - pkg: sigs.k8s.io/controller-runtime/pkg/metrics/server
         alias: metricsserver
@@ -169,6 +169,11 @@ issues:
         - staticcheck
       text: "SA1019: in.(.+) is deprecated"
       path: .*(api|types)\/.*\/conversion.*\.go$
+    - linters:
+        - staticcheck
+        #  SA1019: "sigs.k8s.io/cluster-api/api/core/v1beta1" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped
+      text: SA1019.*sigs.k8s.io/cluster-api/\S+ is deprecated
+      path: .*api/v1beta1/.*
     - linters:
         - staticcheck
       text: "SA1019: .*FailureReason is deprecated"

.vscode/settings.json

@@ -8,23 +8,23 @@
         "editor.formatOnSave": true
     },
     "workbench.colorCustomizations": {
-        "activityBar.activeBackground": "#3399ff",
-        "activityBar.background": "#3399ff",
+        "activityBar.activeBackground": "#fbed80",
+        "activityBar.background": "#fbed80",
         "activityBar.foreground": "#15202b",
         "activityBar.inactiveForeground": "#15202b99",
-        "activityBarBadge.background": "#bf0060",
-        "activityBarBadge.foreground": "#e7e7e7",
-        "commandCenter.border": "#e7e7e799",
-        "sash.hoverBorder": "#3399ff",
-        "statusBar.background": "#007fff",
-        "statusBar.foreground": "#e7e7e7",
-        "statusBarItem.hoverBackground": "#3399ff",
-        "statusBarItem.remoteBackground": "#007fff",
-        "statusBarItem.remoteForeground": "#e7e7e7",
-        "titleBar.activeBackground": "#007fff",
-        "titleBar.activeForeground": "#e7e7e7",
-        "titleBar.inactiveBackground": "#007fff99",
-        "titleBar.inactiveForeground": "#e7e7e799"
+        "activityBarBadge.background": "#06b9a5",
+        "activityBarBadge.foreground": "#15202b",
+        "commandCenter.border": "#15202b99",
+        "sash.hoverBorder": "#fbed80",
+        "statusBar.background": "#f9e64f",
+        "statusBar.foreground": "#15202b",
+        "statusBarItem.hoverBackground": "#f7df1e",
+        "statusBarItem.remoteBackground": "#f9e64f",
+        "statusBarItem.remoteForeground": "#15202b",
+        "titleBar.activeBackground": "#f9e64f",
+        "titleBar.activeForeground": "#15202b",
+        "titleBar.inactiveBackground": "#f9e64f99",
+        "titleBar.inactiveForeground": "#15202b99"
     },
-    "peacock.color": "#007fff"
+    "peacock.color": "#f9e64f"
 }

Makefile

@@ -115,7 +115,7 @@ $(CTLPTL):
 CLUSTERCTL := $(abspath $(TOOLS_BIN_DIR)/clusterctl)
 clusterctl: $(CLUSTERCTL) ## Build a local copy of clusterctl
 $(CLUSTERCTL):
-	go install sigs.k8s.io/cluster-api/cmd/clusterctl@v1.10.9
+	go install sigs.k8s.io/cluster-api/cmd/clusterctl@v1.11.4
 
 HCLOUD := $(abspath $(TOOLS_BIN_DIR)/hcloud)
 hcloud: $(HCLOUD) ## Build a local copy of hcloud
@@ -225,28 +225,28 @@ env-vars-for-wl-cluster:
 create-workload-cluster-hcloud: env-vars-for-wl-cluster $(KUSTOMIZE) install-crds ## Creates a workload-cluster.
 	# Create workload Cluster.
 	./hack/ensure-env-variables.sh HCLOUD_TOKEN
-	./hack/create-workload-cluster.sh v1beta1 hcloud
+	./hack/create-workload-cluster.sh v1beta2 hcloud
 
 create-workload-cluster-hcloud-network: env-vars-for-wl-cluster $(KUSTOMIZE) ## Creates a workload-cluster.
 	# Create workload Cluster.
 	./hack/ensure-env-variables.sh HCLOUD_TOKEN
-	./hack/create-workload-cluster.sh v1beta1 hcloud-network
+	./hack/create-workload-cluster.sh v1beta2 hcloud-network
 
 # Use that, if you want to test hcloud control-planes, hcloud worker and bm worker.
 create-workload-cluster-hetzner-hcloud-control-plane: env-vars-for-wl-cluster $(KUSTOMIZE) ## Creates a workload-cluster.
 	# Create workload Cluster.
 	./hack/ensure-env-variables.sh HCLOUD_TOKEN HETZNER_ROBOT_USER HETZNER_ROBOT_PASSWORD HETZNER_SSH_PRIV_PATH HETZNER_SSH_PUB_PATH SSH_KEY_NAME
-	./hack/create-workload-cluster.sh --robot v1beta1 hetzner-hcloud-control-planes
+	./hack/create-workload-cluster.sh --robot v1beta2 hetzner-hcloud-control-planes
 
 create-workload-cluster-hetzner-baremetal-control-plane: env-vars-for-wl-cluster $(KUSTOMIZE) ## Creates a workload-cluster.
 	# Create workload Cluster.
 	./hack/ensure-env-variables.sh HCLOUD_TOKEN HETZNER_ROBOT_USER HETZNER_ROBOT_PASSWORD HETZNER_SSH_PRIV_PATH HETZNER_SSH_PUB_PATH SSH_KEY_NAME
-	./hack/create-workload-cluster.sh --robot v1beta1 hetzner-baremetal-control-plane
+	./hack/create-workload-cluster.sh --robot v1beta2 hetzner-baremetal-control-plane
 
 create-workload-cluster-hetzner-baremetal-control-plane-remediation: env-vars-for-wl-cluster $(KUSTOMIZE) ## Creates a workload-cluster.
 	# Create workload Cluster.
 	./hack/ensure-env-variables.sh HCLOUD_TOKEN HETZNER_ROBOT_USER HETZNER_ROBOT_PASSWORD HETZNER_SSH_PRIV_PATH HETZNER_SSH_PUB_PATH SSH_KEY_NAME
-	./hack/create-workload-cluster.sh --robot v1beta1 hetzner-baremetal-control-plane-remediation
+	./hack/create-workload-cluster.sh --robot v1beta2 hetzner-baremetal-control-plane-remediation
 
 move-to-workload-cluster: $(CLUSTERCTL)
 	$(CLUSTERCTL) init --kubeconfig=$(WORKER_CLUSTER_KUBECONFIG) --core cluster-api --bootstrap kubeadm --control-plane kubeadm --infrastructure $(INFRA_PROVIDER)

README.md

@@ -69,30 +69,15 @@ In addition to the pure creation and operation of Kubernetes clusters, this prov
 
 ## 🖇️ Compatibility with Cluster API and Kubernetes Versions
 
-This provider's versions are compatible with the following versions of Cluster API:
+[Compatibility Table](./docs/caph/01-getting-started/01-introduction.md#compatibility-with-cluster-api-and-kubernetes-versions)
 
-|                                      | CAPI `v1beta1` (`v1.8.x`) | CAPI `v1beta1` (`v1.9.x`) | CAPI `v1beta1` (`v1.10.x`) | 
-| ------------------------------------ | ------------------------- | ------------------------- | -------------------------- | 
-| Hetzner Provider `v1.0.x`            | ✅                        | ✅                        | ✅                         |
+## What is new in CAPH v1.1.x?
 
+With CAPH v1.1.x we adapt to the changes done by Cluster-API. CAPI bumped the API version from
+v1beta1 to v1beta2 with a lot of changes. See [v1.10 to v1.11 - The Cluster API
+Book](https://cluster-api.sigs.k8s.io/developer/providers/migrations/v1.10-to-v1.11)
 
-This provider's versions can install and manage the following versions of Kubernetes:
-
-|                   | Hetzner Provider `v1.0.x` |
-| ----------------- | ------------------------- |
-| Kubernetes 1.31.x | ✅                        |
-| Kubernetes 1.32.x | ✅                        |
-| Kubernetes 1.33.x | ✅                        |
-| Kubernetes 1.34.x | ❔                        |
-
-Test status:
-
-- ✅ tested
-- ❔ should work, but we weren't able to test it
-
-Each version of Cluster API for Hetzner will attempt to support at least two Kubernetes versions.
-
-**NOTE:** As the versioning for this project is tied to the versioning of Cluster API, future modifications to this policy may be made to more closely align with other providers in the Cluster API ecosystem.
+TODO TODO TODO: Summarize this PR here: https://github.com/syself/cluster-api-provider-hetzner/pull/1734
 
 ## 💿 Operating System Images
 

Tiltfile

@@ -22,7 +22,7 @@ settings = {
     "deploy_observability": False,
     "preload_images_for_kind": True,
     "kind_cluster_name": "caph",
-    "capi_version": "v1.10.9",
+    "capi_version": "v1.11.4",
     "cabpt_version": "v0.5.6",
     "cacppt_version": "v0.4.11",
     "cert_manager_version": "v1.11.0",

api/v1beta1/conditions_const.go

@@ -16,7 +16,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" // Deprecated, will be removed
 
 const (
 	// LoadBalancerReadyCondition reports on whether a control plane load balancer was successfully reconciled.