⚠️ Bump CAPI to v1.12.7 (keep v1beta1 contract) (#2000)

Author: abdullah599

.envrc.sample

@@ -6,7 +6,7 @@ export SSH_KEY_NAME=my-caph-ssh-key
 export HCLOUD_REGION=hel1
 export CONTROL_PLANE_MACHINE_COUNT=1
 export WORKER_MACHINE_COUNT=1
-export KUBERNETES_VERSION=v1.34.7
+export KUBERNETES_VERSION=v1.35.4
 export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx32
 export HCLOUD_WORKER_MACHINE_TYPE=cpx32
 export SSH_KEY=$HOME/.ssh/my-caph-ssh-key.pub

.hadolint.yaml

@@ -4,4 +4,4 @@ ignored: []
 no-color: false
 no-fail: false
 strict-labels: false
-disable-ignore-pragma: false
+disable-ignore-pragma: false

Makefile

@@ -82,7 +82,7 @@ MGT_CLUSTER_KUBECONFIG ?= ".mgt-cluster-kubeconfig.yaml"
 # Kubebuilder.
 # go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 # The command `setup-envtest list` shows the available versions.
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.34.1
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.35.0
 
 ##@ Binaries
 ############
@@ -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.11.8
+	go install sigs.k8s.io/cluster-api/cmd/clusterctl@v1.12.7
 
 HCLOUD := $(abspath $(TOOLS_BIN_DIR)/hcloud)
 hcloud: $(HCLOUD) ## Build a local copy of hcloud
@@ -132,7 +132,7 @@ KUBECTL := $(abspath $(TOOLS_BIN_DIR)/kubectl)
 kubectl: $(TOOLS_BIN_DIR) $(KUBECTL) ## Build a local copy of kubectl
 $(KUBECTL):
 	mkdir -p $(TOOLS_BIN_DIR)
-	curl -fsSL "https://dl.k8s.io/release/v1.34.7/bin/$$(go env GOOS)/$$(go env GOARCH)/kubectl" -o $(KUBECTL)
+	curl -fsSL "https://dl.k8s.io/release/v1.35.4/bin/$$(go env GOOS)/$$(go env GOARCH)/kubectl" -o $(KUBECTL)
 	chmod a+rx $(KUBECTL)
 
 go-binsize-treemap := $(abspath $(TOOLS_BIN_DIR)/go-binsize-treemap)
@@ -479,7 +479,7 @@ test-e2e-upgrade-$(INFRA_SHORT): $(E2E_CONF_FILE) $(if $(SKIP_IMAGE_BUILD),,e2e-
 	GINKGO_FOKUS="'\[Upgrade CAPH\]'" GINKGO_NODES=2 ./hack/ci-e2e-capi.sh
 
 .PHONY: test-e2e-upgrade-kubernetes
-test-e2e-upgrade-kubernetes: $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFACTS)
+test-e2e-upgrade-kubernetes: $(E2E_CONF_FILE) $(if $(SKIP_IMAGE_BUILD),,e2e-image) $(ARTIFACTS)
 	GINKGO_FOKUS="'\[Upgrade Kubernetes\]'" GINKGO_NODES=2 ./hack/ci-e2e-capi.sh
 
 .PHONY: test-e2e-conformance

Tiltfile

@@ -22,10 +22,10 @@ settings = {
     "deploy_observability": False,
     "preload_images_for_kind": True,
     "kind_cluster_name": "caph",
-    "capi_version": "v1.11.8",
+    "capi_version": "v1.12.7",
     "cabpt_version": "v0.5.6",
     "cacppt_version": "v0.4.11",
-    "cert_manager_version": "v1.11.0",
+    "cert_manager_version": "v1.20.2",
     "extra_args": {
         "hetzner": [
             "--log-level=debug",

config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclusters.yaml

@@ -83,9 +83,6 @@ spec:
                     description: port is the port on which the API server is serving.
                     format: int32
                     type: integer
-                required:
-                - host
-                - port
                 type: object
               controlPlaneLoadBalancer:
                 description: ControlPlaneLoadBalancer is an optional configuration

config/crd/bases/infrastructure.cluster.x-k8s.io_hetznerclustertemplates.yaml

@@ -107,9 +107,6 @@ spec:
                               is serving.
                             format: int32
                             type: integer
-                        required:
-                        - host
-                        - port
                         type: object
                       controlPlaneLoadBalancer:
                         description: ControlPlaneLoadBalancer is an optional configuration

controllers/hcloudremediation_controller_test.go

@@ -257,7 +257,7 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 					return fmt.Errorf("hcloudMachine.Status.BootState is not HCloudBootStateOperatingSystemRunning, but: %q", hcloudMachine.Status.BootState)
 				}
 				return nil
-			}).NotTo(HaveOccurred())
+			}, timeout).NotTo(HaveOccurred())
 
 			Expect(testEnv.Create(ctx, hcloudRemediation)).To(Succeed())
 
@@ -291,7 +291,7 @@ var _ = Describe("HCloudRemediationReconciler", func() {
 						hcloudMachine.Status.BootState)
 				}
 				return nil
-			}).NotTo(HaveOccurred())
+			}, timeout).NotTo(HaveOccurred())
 			hcloudRemediation.Status.RetryCount = hcloudRemediation.Spec.Strategy.RetryLimit
 			Expect(testEnv.Create(ctx, hcloudRemediation)).To(Succeed())
 

docs/caph/01-getting-started/02-quickstart/03-creating-a-workload-cluster.md

@@ -11,7 +11,7 @@ The `clusterctl generate cluster` command returns a YAML template for creating a
 It generates a YAML file named `my-cluster.yaml` with a predefined list of Cluster API objects (`Cluster`, `Machines`, `MachineDeployments`, etc.) to be deployed in the current namespace.
 
 ```shell
-clusterctl generate cluster my-cluster --kubernetes-version v1.34.7 --control-plane-machine-count=3 --worker-machine-count=3  > my-cluster.yaml
+clusterctl generate cluster my-cluster --kubernetes-version v1.35.4 --control-plane-machine-count=3 --worker-machine-count=3  > my-cluster.yaml
 ```
 
 {% callout %}

docs/caph/01-getting-started/03-preparation.md

@@ -74,7 +74,7 @@ export CLUSTER_NAME="my-cluster"
 export HCLOUD_REGION="fsn1"
 export CONTROL_PLANE_MACHINE_COUNT=3
 export WORKER_MACHINE_COUNT=3
-export KUBERNETES_VERSION=1.34.7
+export KUBERNETES_VERSION=1.35.4
 export HCLOUD_CONTROL_PLANE_MACHINE_TYPE=cpx32
 export HCLOUD_WORKER_MACHINE_TYPE=cpx32
 ```
@@ -96,7 +96,7 @@ Required Variables:
 Optional Variables:
   - CLUSTER_NAME                 (defaults to hetzner-cluster)
   - CONTROL_PLANE_MACHINE_COUNT  (defaults to 3)
-  - KUBERNETES_VERSION           (defaults to 1.34.7)
+  - KUBERNETES_VERSION           (defaults to 1.35.4)
   - WORKER_MACHINE_COUNT         (defaults to 3)
 ```
 

docs/caph/02-topics/04-upgrading-caph.md

@@ -58,9 +58,9 @@ Checking new release availability...
 Latest release available for the v1beta2 API Version of Cluster API (contract):
 
 NAME                     NAMESPACE                           TYPE                     CURRENT VERSION   NEXT VERSION
-bootstrap-kubeadm        capi-kubeadm-bootstrap-system       BootstrapProvider        v1.11.6            v1.11.8
-control-plane-kubeadm    capi-kubeadm-control-plane-system   ControlPlaneProvider     v1.11.6            v1.11.8
-cluster-api              capi-system                         CoreProvider             v1.11.6            v1.11.8
+bootstrap-kubeadm        capi-kubeadm-bootstrap-system       BootstrapProvider        v1.11.8            v1.12.7
+control-plane-kubeadm    capi-kubeadm-control-plane-system   ControlPlaneProvider     v1.11.8            v1.12.7
+cluster-api              capi-system                         CoreProvider             v1.11.8            v1.12.7
 infrastructure-hetzner   caph-system                         InfrastructureProvider   v1.0.7           Already up to date
 
 You can now apply the upgrade by executing the following command:
@@ -80,23 +80,23 @@ You might be surprised that for `infrastructure-hetzner`, you see the "Already u
 
 ## Upgrade cluster-API
 
-We will upgrade cluster API core components to the v1.11.8 version.
+We will upgrade cluster API core components to the v1.12.7 version.
 Use the command, which you saw in the plan:
 
 ```console
 $ clusterctl upgrade apply --contract v1beta2
 Checking cert-manager version...
 Cert-manager is already up to date
 Performing upgrade...
-Scaling down Provider="cluster-api" Version="v1.11.6" Namespace="capi-system"
-Scaling down Provider="bootstrap-kubeadm" Version="v1.11.6" Namespace="capi-kubeadm-bootstrap-system"
-Scaling down Provider="control-plane-kubeadm" Version="v1.11.6" Namespace="capi-kubeadm-control-plane-system"
-Deleting Provider="cluster-api" Version="v1.11.6" Namespace="capi-system"
-Installing Provider="cluster-api" Version="v1.11.8" TargetNamespace="capi-system"
-Deleting Provider="bootstrap-kubeadm" Version="v1.11.6" Namespace="capi-kubeadm-bootstrap-system"
-Installing Provider="bootstrap-kubeadm" Version="v1.11.8" TargetNamespace="capi-kubeadm-bootstrap-system"
-Deleting Provider="control-plane-kubeadm" Version="v1.11.6" Namespace="capi-kubeadm-control-plane-system"
-Installing Provider="control-plane-kubeadm" Version="v1.11.8" TargetNamespace="capi-kubeadm-control-plane-system"
+Scaling down Provider="cluster-api" Version="v1.11.8" Namespace="capi-system"
+Scaling down Provider="bootstrap-kubeadm" Version="v1.11.8" Namespace="capi-kubeadm-bootstrap-system"
+Scaling down Provider="control-plane-kubeadm" Version="v1.11.8" Namespace="capi-kubeadm-control-plane-system"
+Deleting Provider="cluster-api" Version="v1.11.8" Namespace="capi-system"
+Installing Provider="cluster-api" Version="v1.12.7" TargetNamespace="capi-system"
+Deleting Provider="bootstrap-kubeadm" Version="v1.11.8" Namespace="capi-kubeadm-bootstrap-system"
+Installing Provider="bootstrap-kubeadm" Version="v1.12.7" TargetNamespace="capi-kubeadm-bootstrap-system"
+Deleting Provider="control-plane-kubeadm" Version="v1.11.8" Namespace="capi-kubeadm-control-plane-system"
+Installing Provider="control-plane-kubeadm" Version="v1.12.7" TargetNamespace="capi-kubeadm-control-plane-system"
 ```
 
 Great, cluster-API was upgraded.