Skip to content

Commit 49f9984

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4627 from Ankitasw/bump-capi
Bump CAPI to v1.5.3
2 parents 130514a + 018b84d commit 49f9984

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws/v2
22

33
go 1.20
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.3
66

77
require (
88
github.com/alessio/shellescape v1.4.2
@@ -40,8 +40,8 @@ require (
4040
k8s.io/klog/v2 v2.100.1
4141
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
4242
sigs.k8s.io/aws-iam-authenticator v0.6.12
43-
sigs.k8s.io/cluster-api v1.5.2
44-
sigs.k8s.io/cluster-api/test v1.5.2
43+
sigs.k8s.io/cluster-api v1.5.3
44+
sigs.k8s.io/cluster-api/test v1.5.3
4545
sigs.k8s.io/controller-runtime v0.15.1
4646
sigs.k8s.io/kustomize/api v0.13.4
4747
sigs.k8s.io/yaml v1.4.0
@@ -61,7 +61,7 @@ require (
6161
github.com/aymerick/douceur v0.2.0 // indirect
6262
github.com/beorn7/perks v1.0.1 // indirect
6363
github.com/blang/semver/v4 v4.0.0 // indirect
64-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
64+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6565
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6666
github.com/chai2010/gettext-go v1.0.2 // indirect
6767
github.com/coredns/caddy v1.1.0 // indirect
@@ -174,9 +174,9 @@ require (
174174
golang.org/x/tools v0.14.0 // indirect
175175
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
176176
google.golang.org/appengine v1.6.7 // indirect
177-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
178-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 // indirect
179-
google.golang.org/grpc v1.56.3 // indirect
177+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
178+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
179+
google.golang.org/grpc v1.58.2 // indirect
180180
google.golang.org/protobuf v1.31.0 // indirect
181181
gopkg.in/inf.v0 v0.9.1 // indirect
182182
gopkg.in/ini.v1 v1.67.0 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
9797
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
9898
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
9999
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
100-
github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
101-
github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
100+
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
101+
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
102102
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
103103
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
104104
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -977,10 +977,10 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D
977977
google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
978978
google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
979979
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
980-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM=
981-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
982-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529 h1:DEH99RbiLZhMxrpEJCZ0A+wdTe0EOgou/poSLx9vWf4=
983-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
980+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw=
981+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
982+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
983+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
984984
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
985985
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
986986
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -1000,8 +1000,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
10001000
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
10011001
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
10021002
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
1003-
google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
1004-
google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
1003+
google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
1004+
google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
10051005
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
10061006
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
10071007
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1090,10 +1090,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10901090
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10911091
sigs.k8s.io/aws-iam-authenticator v0.6.12 h1:XlW7djx+FqvyIysdBN60AIKBvHMr+MWVT87U0cG+Qlk=
10921092
sigs.k8s.io/aws-iam-authenticator v0.6.12/go.mod h1:uh/d/yhtzJXBdevntKgTKRaabgD2T/JI/YdV+9IaycE=
1093-
sigs.k8s.io/cluster-api v1.5.2 h1:pCsyEHwTBb7n+U5Z2OA5STxdJ1EuSpJv8FLBx4lii3s=
1094-
sigs.k8s.io/cluster-api v1.5.2/go.mod h1:EGJUNpFWi7dF426tO8MG/jE+w7T0UO5KyMnOwQ5riUY=
1095-
sigs.k8s.io/cluster-api/test v1.5.2 h1:Hlorgn4ebGdSxP4IZAT7eMweAowh4n0/vdhc4HAPNF8=
1096-
sigs.k8s.io/cluster-api/test v1.5.2/go.mod h1:mFlsY1y0lApBgQyXbmVprdzCK+9MQNp1C38K+aZdn5A=
1093+
sigs.k8s.io/cluster-api v1.5.3 h1:TtxneDCps14sZ9bNr515ivBRMj9OwUE6mRUr6l7fSBA=
1094+
sigs.k8s.io/cluster-api v1.5.3/go.mod h1:0fMUk93Wf7AkQHIWLbDoKsiUHaMxnpqfLMlVmx8DX7Q=
1095+
sigs.k8s.io/cluster-api/test v1.5.3 h1:csAqV0aCJ6rsOfr2k5FaZ6ENdTZgJS44mxPvrHtMIlc=
1096+
sigs.k8s.io/cluster-api/test v1.5.3/go.mod h1:D+jHrP3ghuN/k/wfOGnE91riDLSzMmyaYjVUkRAnl80=
10971097
sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
10981098
sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
10991099
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.12.2
2828
loadBehavior: tryLoad
29-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.2
29+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.3
3030
loadBehavior: tryLoad
31-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.2
31+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.3
3232
loadBehavior: tryLoad
33-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.2
33+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.3
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.5.2 # 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.5.2/core-components.yaml"
51+
- name: v1.5.3 # 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.5.3/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.5.2 # 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.5.2/bootstrap-components.yaml"
78+
- name: v1.5.3 # 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.5.3/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.5.2 # 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.5.2/control-plane-components.yaml"
105+
- name: v1.5.3 # 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.5.3/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.12.2
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.2
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.3
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.2
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.3
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.2
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.3
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.5.2
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/core-components.yaml"
37+
- name: v1.5.3
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/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.5.2
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/bootstrap-components.yaml"
53+
- name: v1.5.3
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/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.5.2
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.2/control-plane-components.yaml"
69+
- name: v1.5.3
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/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
@@ -16,7 +16,7 @@ MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
1717
GH_VERSION := 2.7.0
1818
CERT_MANAGER_VERSION := v1.12.2
19-
CAPI_VERSION := v1.5.2
19+
CAPI_VERSION := v1.5.3
2020
KPROMO_VERSION := v4.0.4
2121
YQ_VERSION := v4.25.2
2222
GOLANGCI_LINT_VERSION := v1.53.3

0 commit comments

Comments
 (0)