diff --git a/go.mod b/go.mod index 73af2a776f..cf7ab8b6b1 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( k8s.io/component-base v0.30.6 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20231127182322-b307cd553661 - sigs.k8s.io/cluster-api v1.8.4 + sigs.k8s.io/cluster-api v1.8.5 sigs.k8s.io/cluster-api/test v1.8.4 sigs.k8s.io/controller-runtime v0.18.5 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 diff --git a/go.sum b/go.sum index 42922c2e37..c198e99682 100644 --- a/go.sum +++ b/go.sum @@ -450,8 +450,8 @@ k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6R k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs= -sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= -sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA= +sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= sigs.k8s.io/cluster-api/test v1.8.4 h1:0SVj0x/pZm5yaEkl2Rj7i3YXIbZ0vCGcUrwI26RGMgc= sigs.k8s.io/cluster-api/test v1.8.4/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc= sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= diff --git a/hack/codegen/go.mod b/hack/codegen/go.mod index 75d6a8a7dd..a3a8e6639b 100644 --- a/hack/codegen/go.mod +++ b/hack/codegen/go.mod @@ -6,7 +6,7 @@ require ( k8s.io/apimachinery v0.30.6 k8s.io/code-generator v0.30.6 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 - sigs.k8s.io/cluster-api v1.8.4 + sigs.k8s.io/cluster-api v1.8.5 ) require ( diff --git a/hack/codegen/go.sum b/hack/codegen/go.sum index 11a57a69b1..a944179a6d 100644 --- a/hack/codegen/go.sum +++ b/hack/codegen/go.sum @@ -141,8 +141,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI= k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= -sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA= +sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 85568a5834..097df2f7df 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -133,7 +133,7 @@ require ( k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect - sigs.k8s.io/cluster-api v1.8.4 // indirect + sigs.k8s.io/cluster-api v1.8.5 // indirect sigs.k8s.io/controller-runtime v0.18.5 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d // indirect diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 5d54a70e6a..46d49fb048 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -522,8 +522,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/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.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= -sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA= +sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6 h1:YF+g/Mr0DF+R0q0tnooUWUxjZ0TtDniMj0fgSh/HA6A= sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221129083400-679ae3e9e6b6/go.mod h1:7luenhlsUTb9obnAferuDFEvhtITw7JjHpXkiDmCmKY= sigs.k8s.io/cluster-api/test v1.8.4 h1:0SVj0x/pZm5yaEkl2Rj7i3YXIbZ0vCGcUrwI26RGMgc= diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index 35f2c695de..674f6f5d6d 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -12,11 +12,11 @@ managementClusterName: capo-e2e images: -- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.8.1 +- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.8.5 loadBehavior: tryLoad -- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.8.1 +- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.8.5 loadBehavior: tryLoad -- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.8.1 +- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.8.5 loadBehavior: tryLoad # Use local dev images built source tree; - name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e @@ -32,8 +32,8 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.8.1 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.1/core-components.yaml" + - name: v1.8.5 + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/core-components.yaml" type: url contract: v1beta1 files: @@ -58,8 +58,8 @@ providers: - name: kubeadm type: BootstrapProvider versions: - - name: v1.8.1 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.1/bootstrap-components.yaml" + - name: v1.8.5 + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/bootstrap-components.yaml" type: url contract: v1beta1 files: @@ -84,8 +84,8 @@ providers: - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.8.1 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.1/control-plane-components.yaml" + - name: v1.8.5 + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/control-plane-components.yaml" type: url contract: v1beta1 files: