Update sigs.k8s.io/cluster-api v1.9.4 -> v1.9.5 (#31)

Author: neoaggelos

go.mod

@@ -15,9 +15,9 @@ require (
 	k8s.io/client-go v0.32.0
 	k8s.io/component-base v0.31.4
 	k8s.io/klog/v2 v2.130.1
-	sigs.k8s.io/cluster-api v1.9.4
-	sigs.k8s.io/cluster-api/test v1.9.4
-	sigs.k8s.io/controller-runtime v0.19.4
+	sigs.k8s.io/cluster-api v1.9.5
+	sigs.k8s.io/cluster-api/test v1.9.5
+	sigs.k8s.io/controller-runtime v0.19.6
 	sigs.k8s.io/yaml v1.4.0
 )
 

go.sum

@@ -473,12 +473,12 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
-sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M=
-sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8=
-sigs.k8s.io/cluster-api/test v1.9.4 h1:ZZ+IPK/lfyc4d/QPtompt+cxXYC6tGJ4kTHhhocgbIM=
-sigs.k8s.io/cluster-api/test v1.9.4/go.mod h1:dHLUcNc9vBNyQyY6NTcqcfpFvIiXmcL5Iqe2sETFD1c=
-sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
-sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
+sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro=
+sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI=
+sigs.k8s.io/cluster-api/test v1.9.5 h1:DtiiDWCIGaWhp4cA7xzGPWeM796XIRQwOptLATe0yFg=
+sigs.k8s.io/cluster-api/test v1.9.5/go.mod h1:YL2wANe8TFWFBka9CDkxjPj7KALqUtK+PtKa4ChNIok=
+sigs.k8s.io/controller-runtime v0.19.6 h1:fuq53qTLQ7aJTA7aNsklNnu7eQtSFqJUomOyM+phPLk=
+sigs.k8s.io/controller-runtime v0.19.6/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
 sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU=

test/e2e/data/config.yaml

@@ -4,18 +4,18 @@
 managementClusterName: capl-e2e
 
 images:
-- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.9.4
+- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.9.5
   loadBehavior: tryLoad
-- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.4
+- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.9.5
   loadBehavior: tryLoad
-- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.4
+- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.9.5
   loadBehavior: tryLoad
 # Keep cert-manager images in lock-step with ClusterAPI version
-- name: quay.io/jetstack/cert-manager-cainjector:v1.16.2
+- name: quay.io/jetstack/cert-manager-cainjector:v1.16.3
   loadBehavior: tryLoad
-- name: quay.io/jetstack/cert-manager-controller:v1.16.2
+- name: quay.io/jetstack/cert-manager-controller:v1.16.3
   loadBehavior: tryLoad
-- name: quay.io/jetstack/cert-manager-webhook:v1.16.2
+- name: quay.io/jetstack/cert-manager-webhook:v1.16.3
   loadBehavior: tryLoad
 # Use local dev images
 - name: ghcr.io/neoaggelos/cluster-api-provider-lxc:e2e
@@ -25,8 +25,8 @@ providers:
 - name: cluster-api
   type: CoreProvider
   versions:
-  - name: v1.9.4
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/core-components.yaml"
+  - name: v1.9.5
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/core-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -37,8 +37,8 @@ providers:
 - name: kubeadm
   type: BootstrapProvider
   versions:
-  - name: v1.9.4
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/bootstrap-components.yaml"
+  - name: v1.9.5
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/bootstrap-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -49,8 +49,8 @@ providers:
 - name: kubeadm
   type: ControlPlaneProvider
   versions:
-  - name: v1.9.4
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/control-plane-components.yaml"
+  - name: v1.9.5
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/control-plane-components.yaml"
     type: url
     contract: v1beta1
     files:

test/e2e/suites/e2e/quick_start_test.go

@@ -51,13 +51,6 @@ var _ = Describe("QuickStart", Label("PRBlocking"), func() {
 		})
 	})
 	Context("Ubuntu", func() {
-		BeforeEach(func() {
-			e2eCtx.OverrideVariables(map[string]string{
-				"KUBERNETES_VERSION": "v1.31.4", // Kubernetes version without pre-built images
-				"LXC_IMAGE_NAME":     "ubuntu:24.04",
-				"INSTALL_KUBEADM":    "true",
-			})
-		})
 		e2e.QuickStartSpec(context.TODO(), func() e2e.QuickStartSpecInput {
 			return e2e.QuickStartSpecInput{
 				E2EConfig:             e2eCtx.E2EConfig,
@@ -71,6 +64,12 @@ var _ = Describe("QuickStart", Label("PRBlocking"), func() {
 				Flavor:                   ptr.To(shared.FlavorDefault),
 				ControlPlaneMachineCount: ptr.To[int64](1),
 				WorkerMachineCount:       ptr.To[int64](1),
+
+				ClusterctlVariables: map[string]string{
+					"KUBERNETES_VERSION": "v1.31.4", // Kubernetes version without pre-built images
+					"LXC_IMAGE_NAME":     "ubuntu:24.04",
+					"INSTALL_KUBEADM":    "true",
+				},
 			}
 		})
 	})
@@ -84,10 +83,6 @@ var _ = Describe("QuickStart", Label("PRBlocking"), func() {
 			if err != nil {
 				Skip("Server does not support OCI instances")
 			}
-
-			e2eCtx.OverrideVariables(map[string]string{
-				"LOAD_BALANCER": "oci: {}",
-			})
 		})
 
 		e2e.QuickStartSpec(context.TODO(), func() e2e.QuickStartSpecInput {
@@ -103,6 +98,10 @@ var _ = Describe("QuickStart", Label("PRBlocking"), func() {
 				Flavor:                   ptr.To(shared.FlavorDefault),
 				ControlPlaneMachineCount: ptr.To[int64](3),
 				WorkerMachineCount:       ptr.To[int64](0),
+
+				ClusterctlVariables: map[string]string{
+					"LOAD_BALANCER": "oci: {}",
+				},
 			}
 		})
 	})