Skip to content

Commit b14a7cc

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3782 from k8s-infra-cherrypick-robot/cherry-pick-3756-to-release-1.10
[release-1.10] Bump CAPI to v1.4.5
2 parents 62daeff + aa1bebb commit b14a7cc

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
292292
./hack/create-custom-cloud-provider-config.sh
293293

294294
# Deploy CAPI
295-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
295+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
296296

297297
# Deploy CAPZ
298298
$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME)

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capz",
22-
"capi_version": "v1.4.4",
22+
"capi_version": "v1.4.5",
2323
"cert_manager_version": "v1.12.2",
2424
"kubernetes_version": "v1.27.2",
2525
"aks_kubernetes_version": "v1.26.3",

‎go.mod‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ require (
4545
k8s.io/kubectl v0.26.1
4646
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
4747
sigs.k8s.io/cloud-provider-azure v1.26.7
48-
sigs.k8s.io/cluster-api v1.4.4
49-
sigs.k8s.io/cluster-api/test v1.4.4
48+
sigs.k8s.io/cluster-api v1.4.5
49+
sigs.k8s.io/cluster-api/test v1.4.5
5050
sigs.k8s.io/controller-runtime v0.14.5
5151
sigs.k8s.io/kind v0.20.0
5252
)
@@ -82,7 +82,7 @@ require (
8282
github.com/davecgh/go-spew v1.1.1 // indirect
8383
github.com/dimchansky/utfbom v1.1.1 // indirect
8484
github.com/docker/distribution v2.8.2+incompatible // indirect
85-
github.com/docker/docker v20.10.24+incompatible // indirect
85+
github.com/docker/docker v24.0.5+incompatible // indirect
8686
github.com/docker/go-connections v0.4.0 // indirect
8787
github.com/docker/go-units v0.5.0 // indirect
8888
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -152,7 +152,6 @@ require (
152152
github.com/prometheus/procfs v0.10.1 // indirect
153153
github.com/russross/blackfriday/v2 v2.1.0 // indirect
154154
github.com/shopspring/decimal v1.3.1 // indirect
155-
github.com/sirupsen/logrus v1.9.0 // indirect
156155
github.com/spf13/afero v1.9.3 // indirect
157156
github.com/spf13/cast v1.5.0 // indirect
158157
github.com/spf13/cobra v1.6.1 // indirect
@@ -176,7 +175,7 @@ require (
176175
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
177176
google.golang.org/appengine v1.6.7 // indirect
178177
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
179-
google.golang.org/grpc v1.54.0 // indirect
178+
google.golang.org/grpc v1.55.0 // indirect
180179
google.golang.org/protobuf v1.30.0 // indirect
181180
gopkg.in/inf.v0 v0.9.1 // indirect
182181
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -196,4 +195,4 @@ require (
196195
sigs.k8s.io/yaml v1.3.0 // indirect
197196
)
198197

199-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.4
198+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.5

‎go.sum‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/
173173
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
174174
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
175175
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
176-
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
177-
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
176+
github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
177+
github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
178178
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
179179
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
180180
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -253,8 +253,8 @@ github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw
253253
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
254254
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
255255
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
256-
github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ=
257256
github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
257+
github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
258258
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
259259
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
260260
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -545,8 +545,6 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
545545
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
546546
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
547547
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
548-
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
549-
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
550548
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
551549
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
552550
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -817,7 +815,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
817815
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
818816
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
819817
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
820-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
821818
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
822819
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
823820
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -999,8 +996,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
999996
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
1000997
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
1001998
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
1002-
google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
1003-
google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
999+
google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
1000+
google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
10041001
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
10051002
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
10061003
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1084,10 +1081,10 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10841081
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
10851082
sigs.k8s.io/cloud-provider-azure v1.26.7 h1:LSVRPyxeTQZPOF7z42zNZGzL1S1N5tg28RBZVy7gea4=
10861083
sigs.k8s.io/cloud-provider-azure v1.26.7/go.mod h1:UIwr0Bk4wQb77wNL9cdT4zZw6DP2AtOQ9EKRt9c5g7Q=
1087-
sigs.k8s.io/cluster-api v1.4.4 h1:+V+mzDe+gsWYclosvWlH0wadC8vIUsBvZLcWOYnVWRA=
1088-
sigs.k8s.io/cluster-api v1.4.4/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
1089-
sigs.k8s.io/cluster-api/test v1.4.4 h1:EhZqbMJ9uY0mptUnSax44FzaScphtCU91LxJq0qfCrI=
1090-
sigs.k8s.io/cluster-api/test v1.4.4/go.mod h1:wF8xhW4V0D+Gfrm5uZk57I0up+8WUQNpB2dNTJ1aTiI=
1084+
sigs.k8s.io/cluster-api v1.4.5 h1:Xwi9cuL3FOR1gB6FhhKi7EEadY4m3CdJAesyx9/kxUo=
1085+
sigs.k8s.io/cluster-api v1.4.5/go.mod h1:HSiT5mE5uuxctGBiQcRJrZ6/iH+CCVmTvOryxSBcBG8=
1086+
sigs.k8s.io/cluster-api/test v1.4.5 h1:0ZuQre03UaxRXgiK3wQjtJNZGebw1xFaPvKFDOi3KaM=
1087+
sigs.k8s.io/cluster-api/test v1.4.5/go.mod h1:OMWLTfmTeFqMtprBE1zCDDpYect1M5jcEYYTSY7AgSA=
10911088
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
10921089
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
10931090
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎test/e2e/config/azure-dev.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ managementClusterName: capz-e2e
33
images:
44
- name: ${MANAGER_IMAGE}
55
loadBehavior: mustLoad
6-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.4
6+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.4.5
77
loadBehavior: tryLoad
8-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.4
8+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.4.5
99
loadBehavior: tryLoad
10-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.4
10+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.4.5
1111
loadBehavior: tryLoad
1212

1313
providers:
@@ -23,8 +23,8 @@ providers:
2323
new: --metrics-addr=:8080
2424
files:
2525
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
26-
- name: v1.4.4
27-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/core-components.yaml
26+
- name: v1.4.5
27+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml
2828
type: url
2929
contract: v1beta1
3030
files:
@@ -46,8 +46,8 @@ providers:
4646
new: --metrics-addr=:8080
4747
files:
4848
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
49-
- name: v1.4.4
50-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/bootstrap-components.yaml
49+
- name: v1.4.5
50+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml
5151
type: url
5252
contract: v1beta1
5353
files:
@@ -68,8 +68,8 @@ providers:
6868
new: --metrics-addr=:8080
6969
files:
7070
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
71-
- name: v1.4.4
72-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.4/control-plane-components.yaml
71+
- name: v1.4.5
72+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml
7373
type: url
7474
contract: v1beta1
7575
files:
@@ -183,7 +183,7 @@ variables:
183183
WINDOWS_CONTAINERD_URL: "${WINDOWS_CONTAINERD_URL:-}"
184184
SECURITY_SCAN_FAIL_THRESHOLD: "${SECURITY_SCAN_FAIL_THRESHOLD:-100}"
185185
SECURITY_SCAN_CONTAINER: "${SECURITY_SCAN_CONTAINER:-quay.io/armosec/kubescape:v2.0.167}"
186-
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
186+
AZURE_CNI_V1_MANIFEST_PATH: "${PWD}/templates/addons/azure-cni-v1.yaml"
187187

188188
intervals:
189189
default/wait-controllers: ["3m", "10s"]

0 commit comments

Comments
 (0)