Skip to content

Commit 1a4a56e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #442 from mboersma/bump-capi
🌱 Bump CAPI to v1.10.6
2 parents 237b321 + ea82876 commit 1a4a56e

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
k8s.io/component-base v0.32.3
2222
k8s.io/klog/v2 v2.130.1
2323
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
24-
sigs.k8s.io/cluster-api v1.10.5
25-
sigs.k8s.io/cluster-api/test v1.10.5
24+
sigs.k8s.io/cluster-api v1.10.6
25+
sigs.k8s.io/cluster-api/test v1.10.6
2626
sigs.k8s.io/controller-runtime v0.20.4
2727
)
2828

@@ -81,7 +81,7 @@ require (
8181
github.com/go-openapi/jsonreference v0.20.2 // indirect
8282
github.com/go-openapi/swag v0.23.0 // indirect
8383
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
84-
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
84+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
8585
github.com/gobuffalo/flect v1.0.3 // indirect
8686
github.com/gobwas/glob v0.2.3 // indirect
8787
github.com/gogo/protobuf v1.3.2 // indirect
@@ -203,4 +203,4 @@ require (
203203
sigs.k8s.io/yaml v1.4.0 // indirect
204204
)
205205

206-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.5
206+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
172172
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
173173
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
174174
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
175-
github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
176-
github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
175+
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
176+
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
177177
github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4=
178178
github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
179179
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -626,10 +626,10 @@ oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=
626626
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
627627
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
628628
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
629-
sigs.k8s.io/cluster-api v1.10.5 h1:yCTEWpbw5SaXMupG0U9GTOs13/q36dGcc9+cFdPuMdE=
630-
sigs.k8s.io/cluster-api v1.10.5/go.mod h1:pJJMuWONGrpgDMsvRbh3pUkrOY+qJoZrBtYJAY7eDXw=
631-
sigs.k8s.io/cluster-api/test v1.10.5 h1:uInODriYhKgSdjrsCdh0ZmwmNAnp+yKgJlp5EmfRXkc=
632-
sigs.k8s.io/cluster-api/test v1.10.5/go.mod h1:n2LsLQxc4RSLDjUXhgzquSTagZTJpUcY7uwtQtCRmaY=
629+
sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g=
630+
sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4=
631+
sigs.k8s.io/cluster-api/test v1.10.6 h1:xMRVX91mmvcWihzFpj9a7Zc5Np+zB6zfYoVD6tyww/s=
632+
sigs.k8s.io/cluster-api/test v1.10.6/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0=
633633
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
634634
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
635635
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎test/e2e/config/helm.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ managementClusterName: caaph-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.5
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.6
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.5
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.6
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.5
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.6
1111
loadBehavior: tryLoad
1212
# Note: This pulls the CAPD image from the staging repo instead of the official registry.
13-
- name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.10.5
13+
- name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.10.6
1414
loadBehavior: tryLoad
1515

1616
providers:
@@ -26,8 +26,8 @@ providers:
2626
new: --metrics-addr=:8080
2727
files:
2828
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
29-
- name: v1.10.5
30-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/core-components.yaml
29+
- name: v1.10.6
30+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml
3131
type: url
3232
contract: v1beta1
3333
files:
@@ -49,8 +49,8 @@ providers:
4949
new: --metrics-addr=:8080
5050
files:
5151
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
52-
- name: v1.10.5
53-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/bootstrap-components.yaml
52+
- name: v1.10.6
53+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml
5454
type: url
5555
contract: v1beta1
5656
files:
@@ -71,8 +71,8 @@ providers:
7171
new: --metrics-addr=:8080
7272
files:
7373
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
74-
- name: v1.10.5
75-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/control-plane-components.yaml
74+
- name: v1.10.6
75+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml
7676
type: url
7777
contract: v1beta1
7878
files:
@@ -95,8 +95,8 @@ providers:
9595
- sourcePath: "${PWD}/test/e2e/data/shared/v1beta1/metadata.yaml"
9696
- sourcePath: "${PWD}/test/e2e/data/addons-helm/v1.5/cluster-template.yaml"
9797
targetName: "cluster-template.yaml"
98-
- name: "v1.10.5" # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
99-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.5/infrastructure-components-development.yaml"
98+
- name: "v1.10.6" # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
99+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/infrastructure-components-development.yaml"
100100
type: "url"
101101
contract: v1beta1
102102
replacements:

0 commit comments

Comments
 (0)