diff --git a/go.mod b/go.mod index 269da782..9a1370f8 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.5 - sigs.k8s.io/cluster-api/test v1.10.5 + sigs.k8s.io/cluster-api v1.10.6 + sigs.k8s.io/cluster-api/test v1.10.6 sigs.k8s.io/controller-runtime v0.20.4 ) @@ -81,7 +81,7 @@ require ( github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect - github.com/go-viper/mapstructure/v2 v2.3.0 // indirect + github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gobuffalo/flect v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -203,4 +203,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.5 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6 diff --git a/go.sum b/go.sum index ffb60a28..fd5024b3 100644 --- a/go.sum +++ b/go.sum @@ -172,8 +172,8 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk= -github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= +github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4= github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -626,10 +626,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.5 h1:yCTEWpbw5SaXMupG0U9GTOs13/q36dGcc9+cFdPuMdE= -sigs.k8s.io/cluster-api v1.10.5/go.mod h1:pJJMuWONGrpgDMsvRbh3pUkrOY+qJoZrBtYJAY7eDXw= -sigs.k8s.io/cluster-api/test v1.10.5 h1:uInODriYhKgSdjrsCdh0ZmwmNAnp+yKgJlp5EmfRXkc= -sigs.k8s.io/cluster-api/test v1.10.5/go.mod h1:n2LsLQxc4RSLDjUXhgzquSTagZTJpUcY7uwtQtCRmaY= +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/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 96a43722..6e75443e 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.5 + - name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.6 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.5 + - name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.6 loadBehavior: tryLoad - - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.5 + - name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.6 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.5 + - name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.10.6 loadBehavior: tryLoad providers: @@ -26,8 +26,8 @@ providers: new: --metrics-addr=:8080 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - name: v1.10.5 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/core-components.yaml + - name: v1.10.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/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.5 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/bootstrap-components.yaml + - name: v1.10.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/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.5 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/control-plane-components.yaml + - name: v1.10.6 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/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.5" # 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.5/infrastructure-components-development.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" type: "url" contract: v1beta1 replacements: