diff --git a/go.mod b/go.mod index a76fe02a..ac9cb088 100644 --- a/go.mod +++ b/go.mod @@ -21,8 +21,8 @@ require ( k8s.io/component-base v0.32.3 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 - sigs.k8s.io/cluster-api v1.10.6 - sigs.k8s.io/cluster-api/test v1.10.6 + sigs.k8s.io/cluster-api v1.10.7 + sigs.k8s.io/cluster-api/test v1.10.7 sigs.k8s.io/controller-runtime v0.20.4 ) @@ -204,4 +204,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.7 diff --git a/go.sum b/go.sum index b9b93c2e..e94a3f09 100644 --- a/go.sum +++ b/go.sum @@ -82,8 +82,8 @@ github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpS github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0= github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM= -github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY= +github.com/coredns/corefile-migration v1.0.28 h1:O8YafUREqUcGbRtcJfOmWU6ifcw2HX76I1QvI5xZpsw= +github.com/coredns/corefile-migration v1.0.28/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU= @@ -648,10 +648,10 @@ oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g= -sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4= -sigs.k8s.io/cluster-api/test v1.10.6 h1:xMRVX91mmvcWihzFpj9a7Zc5Np+zB6zfYoVD6tyww/s= -sigs.k8s.io/cluster-api/test v1.10.6/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0= +sigs.k8s.io/cluster-api v1.10.7 h1:MuzeuAhLJLTgmqTitVz1XeXZLgAd4tJfnH9xitKG63A= +sigs.k8s.io/cluster-api v1.10.7/go.mod h1:PTuQc7CgNahPlJrLNJ0q4gKdpQ4wITgeVXDiDQQv2to= +sigs.k8s.io/cluster-api/test v1.10.7 h1:RoaKevoDx2xsloAvAzmRcuImmpS7tNJcEd6k/KH2Cf4= +sigs.k8s.io/cluster-api/test v1.10.7/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0= sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= diff --git a/test/e2e/config/helm.yaml b/test/e2e/config/helm.yaml index 6e75443e..4027fd0f 100644 --- a/test/e2e/config/helm.yaml +++ b/test/e2e/config/helm.yaml @@ -3,14 +3,14 @@ managementClusterName: caaph-e2e images: - name: ${MANAGER_IMAGE} loadBehavior: mustLoad - - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.6 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.7 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.6 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.7 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.6 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.7 loadBehavior: tryLoad # Note: This pulls the CAPD image from the staging repo instead of the official registry. - - name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.10.6 + - name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.10.7 loadBehavior: tryLoad providers: @@ -26,8 +26,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/core-components.yaml type: url contract: v1beta1 files: @@ -49,8 +49,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/bootstrap-components.yaml type: url contract: v1beta1 files: @@ -71,8 +71,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/control-plane-components.yaml type: url contract: v1beta1 files: @@ -95,8 +95,8 @@ providers: - sourcePath: "${PWD}/test/e2e/data/shared/v1beta1/metadata.yaml" - sourcePath: "${PWD}/test/e2e/data/addons-helm/v1.5/cluster-template.yaml" targetName: "cluster-template.yaml" - - name: "v1.10.6" # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/infrastructure-components-development.yaml" + - name: "v1.10.7" # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/infrastructure-components-development.yaml" type: "url" contract: v1beta1 replacements: