Skip to content

Commit 705c281

Browse files
nrbnrb
committed
Bump CAPI to v1.7.1
Signed-off-by: Nolan Brubaker <[email protected]>
1 parent 63c6635 commit 705c281

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ replace (
1010
github.com/prometheus/common => github.com/prometheus/common v0.46.0
1111
// kube-openapi should match the version imported by CAPI.
1212
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
13-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0
13+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.1
1414
)
1515

1616
require (
@@ -53,8 +53,8 @@ require (
5353
k8s.io/klog/v2 v2.110.1
5454
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
5555
sigs.k8s.io/aws-iam-authenticator v0.6.13
56-
sigs.k8s.io/cluster-api v1.7.0
57-
sigs.k8s.io/cluster-api/test v1.7.0
56+
sigs.k8s.io/cluster-api v1.7.1
57+
sigs.k8s.io/cluster-api/test v1.7.1
5858
sigs.k8s.io/controller-runtime v0.17.3
5959
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3
6060
sigs.k8s.io/yaml v1.4.0

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -741,10 +741,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
741741
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
742742
sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb4e6Rs9gA=
743743
sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
744-
sigs.k8s.io/cluster-api v1.7.0 h1:sWK6xs2MkCqPZhumsrti0OdKyGcu/c5aBz9XAWFIq5E=
745-
sigs.k8s.io/cluster-api v1.7.0/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
746-
sigs.k8s.io/cluster-api/test v1.7.0 h1:SH0Rww/LTx1LSUwlfihZoVNKkT9oJRyeqWRaD81rFms=
747-
sigs.k8s.io/cluster-api/test v1.7.0/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
744+
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
745+
sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
746+
sigs.k8s.io/cluster-api/test v1.7.1 h1:QDru2586ZjIFBTW1Z7VVXVtauzR/yANm4tglUNLm9iE=
747+
sigs.k8s.io/cluster-api/test v1.7.1/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
748748
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
749749
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
750750
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎test/e2e/data/e2e_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ images:
2626
loadBehavior: tryLoad
2727
- name: quay.io/jetstack/cert-manager-controller:v1.14.4
2828
loadBehavior: tryLoad
29-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.0
29+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.1
3030
loadBehavior: tryLoad
31-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.0
31+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.1
3232
loadBehavior: tryLoad
33-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.0
33+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.1
3434
loadBehavior: tryLoad
3535

3636
providers:
@@ -48,8 +48,8 @@ providers:
4848
new: "imagePullPolicy: IfNotPresent"
4949
- old: --metrics-bind-addr=127.0.0.1:8080
5050
new: --metrics-bind-addr=:8080
51-
- name: v1.7.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/core-components.yaml"
51+
- name: v1.7.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/core-components.yaml"
5353
type: "url"
5454
contract: v1beta1
5555
files:
@@ -75,8 +75,8 @@ providers:
7575
new: "imagePullPolicy: IfNotPresent"
7676
- old: --metrics-bind-addr=127.0.0.1:8080
7777
new: --metrics-bind-addr=:8080
78-
- name: v1.7.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/bootstrap-components.yaml"
78+
- name: v1.7.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -102,8 +102,8 @@ providers:
102102
new: "imagePullPolicy: IfNotPresent"
103103
- old: --metrics-bind-addr=127.0.0.1:8080
104104
new: --metrics-bind-addr=:8080
105-
- name: v1.7.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/control-plane-components.yaml"
105+
- name: v1.7.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/control-plane-components.yaml"
107107
type: "url"
108108
contract: v1beta1
109109
files:

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.14.4
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.0
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.7.1
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.0
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.7.1
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.0
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.7.1
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.7.0
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/core-components.yaml"
37+
- name: v1.7.1
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.7.0
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/bootstrap-components.yaml"
53+
- name: v1.7.1
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.7.0
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0/control-plane-components.yaml"
69+
- name: v1.7.1
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.1/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

‎versions.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
1717
CERT_MANAGER_VERSION := v1.14.4
18-
CAPI_VERSION := v1.7.0
18+
CAPI_VERSION := v1.7.1
1919
KPROMO_VERSION := v4.0.4
2020
YQ_VERSION := v4.25.2
2121
GOLANGCI_LINT_VERSION := v1.53.3

0 commit comments

Comments
 (0)