Skip to content

Commit 91392e3

Browse files
authored
Merge pull request #449 from mboersma/bump-capi
🌱 Bump CAPI to v1.10.7
2 parents f44587b + c870be0 commit 91392e3

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

go.mod

Lines changed: 3 additions & 3 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.6
25-
sigs.k8s.io/cluster-api/test v1.10.6
24+
sigs.k8s.io/cluster-api v1.10.7
25+
sigs.k8s.io/cluster-api/test v1.10.7
2626
sigs.k8s.io/controller-runtime v0.20.4
2727
)
2828

@@ -204,4 +204,4 @@ require (
204204
sigs.k8s.io/yaml v1.4.0 // indirect
205205
)
206206

207-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6
207+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.7

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpS
8282
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
8383
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
8484
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
85-
github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM=
86-
github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
85+
github.com/coredns/corefile-migration v1.0.28 h1:O8YafUREqUcGbRtcJfOmWU6ifcw2HX76I1QvI5xZpsw=
86+
github.com/coredns/corefile-migration v1.0.28/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
8787
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
8888
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
8989
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=
648648
oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo=
649649
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
650650
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
651-
sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g=
652-
sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4=
653-
sigs.k8s.io/cluster-api/test v1.10.6 h1:xMRVX91mmvcWihzFpj9a7Zc5Np+zB6zfYoVD6tyww/s=
654-
sigs.k8s.io/cluster-api/test v1.10.6/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0=
651+
sigs.k8s.io/cluster-api v1.10.7 h1:MuzeuAhLJLTgmqTitVz1XeXZLgAd4tJfnH9xitKG63A=
652+
sigs.k8s.io/cluster-api v1.10.7/go.mod h1:PTuQc7CgNahPlJrLNJ0q4gKdpQ4wITgeVXDiDQQv2to=
653+
sigs.k8s.io/cluster-api/test v1.10.7 h1:RoaKevoDx2xsloAvAzmRcuImmpS7tNJcEd6k/KH2Cf4=
654+
sigs.k8s.io/cluster-api/test v1.10.7/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0=
655655
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
656656
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
657657
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.6
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.10.7
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.6
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.10.7
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.6
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.10.7
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.6
13+
- name: gcr.io/k8s-staging-cluster-api/capd-manager:v1.10.7
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.6
30-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml
29+
- name: v1.10.7
30+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/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.6
53-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml
52+
- name: v1.10.7
53+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/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.6
75-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml
74+
- name: v1.10.7
75+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/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.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"
98+
- name: "v1.10.7" # 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.7/infrastructure-components-development.yaml"
100100
type: "url"
101101
contract: v1beta1
102102
replacements:

0 commit comments

Comments
 (0)