Skip to content

Commit ca07515

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2091 from chrischdi/pr-bump-capi-v1-5-0
🌱 Bump CAPI to v1.5.0
2 parents c5ffa76 + 50e0f64 commit ca07515

File tree

6 files changed

+37
-37
lines changed

6 files changed

+37
-37
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KIND_BIN := kind
119119
KIND := $(abspath $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER))
120120
KIND_PKG := sigs.k8s.io/kind
121121

122-
CAPI_HACK_TOOLS_VER := 038b533a1 # Note: this is the commit ID of the dependend CAPI release tag, currently v1.5.0-rc.0
122+
CAPI_HACK_TOOLS_VER := 4abf44cd85c4590602e4c10543d53cd4ec914845 # Note: this is the commit ID of the dependend CAPI release tag, currently v1.5.0
123123

124124
CONVERSION_VERIFIER_VER := $(CAPI_HACK_TOOLS_VER)
125125
CONVERSION_VERIFIER_BIN := conversion-verifier

‎go.mod

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

33
go 1.20
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0-rc.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0
66

77
require (
88
github.com/go-logr/logr v1.2.4
@@ -35,7 +35,7 @@ require (
3535
k8s.io/klog/v2 v2.90.1
3636
k8s.io/utils v0.0.0-20230209194617-a36077c30491
3737
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000
38-
sigs.k8s.io/cluster-api/test v1.5.0-rc.1
38+
sigs.k8s.io/cluster-api/test v1.5.0
3939
sigs.k8s.io/controller-runtime v0.15.0
4040
sigs.k8s.io/kind v0.20.0
4141
sigs.k8s.io/yaml v1.3.0
@@ -44,7 +44,7 @@ require (
4444
require (
4545
github.com/adrg/xdg v0.4.0 // indirect
4646
github.com/blang/semver/v4 v4.0.0 // indirect
47-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
47+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
4848
github.com/go-logr/zapr v1.2.4 // indirect
4949
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5050
github.com/google/gnostic v0.6.9 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkg
163163
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
164164
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
165165
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
166-
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
167-
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
166+
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
167+
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
168168
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
169169
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
170170
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -1164,10 +1164,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
11641164
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
11651165
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
11661166
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
1167-
sigs.k8s.io/cluster-api v1.5.0-rc.1 h1:pLaRjFlknMWMKzippA+Dm2HXmONubAicSujFhsO2pzo=
1168-
sigs.k8s.io/cluster-api v1.5.0-rc.1/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
1169-
sigs.k8s.io/cluster-api/test v1.5.0-rc.1 h1:jFqe7FH0z9dbuHUADHKLrDlc8TLeLFFCETlNOhSU4Q0=
1170-
sigs.k8s.io/cluster-api/test v1.5.0-rc.1/go.mod h1:jcB/RQqtF8Od75DKWEoVVxWv9/n6wKuTQO63ILJJTQg=
1167+
sigs.k8s.io/cluster-api v1.5.0 h1:pwXvzScbAwnrB7EWHTApzW+VQfrj2OSrWAQDC9+bcbU=
1168+
sigs.k8s.io/cluster-api v1.5.0/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
1169+
sigs.k8s.io/cluster-api/test v1.5.0 h1:ePfrh7S+eaVWy+D0ca4AjzhBqrhXxRE9NTr5te4hCa0=
1170+
sigs.k8s.io/cluster-api/test v1.5.0/go.mod h1:Ii5Mh9oVq7QJEtiUkGg9mM2qojjWxvsqmL8TMlwZViM=
11711171
sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
11721172
sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
11731173
sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=

‎test/e2e/config/vsphere-ci.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
# For creating local images, run ./hack/e2e.sh
99

1010
images:
11-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-rc.1
11+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0
1212
loadBehavior: tryLoad
13-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-rc.1
13+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0
1414
loadBehavior: tryLoad
15-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-rc.1
15+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0
1616
loadBehavior: tryLoad
1717
- name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
1818
loadBehavior: mustLoad
@@ -37,9 +37,9 @@ providers:
3737
replacements:
3838
- old: "imagePullPolicy: Always"
3939
new: "imagePullPolicy: IfNotPresent"
40-
- name: v1.5.0-rc.1
40+
- name: v1.5.0
4141
# Use manifest from source files
42-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/core-components.yaml"
42+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/core-components.yaml"
4343
type: "url"
4444
contract: v1beta1
4545
files:
@@ -60,9 +60,9 @@ providers:
6060
replacements:
6161
- old: "imagePullPolicy: Always"
6262
new: "imagePullPolicy: IfNotPresent"
63-
- name: v1.5.0-rc.1
63+
- name: v1.5.0
6464
# Use manifest from source files
65-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/bootstrap-components.yaml"
65+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/bootstrap-components.yaml"
6666
type: "url"
6767
contract: v1beta1
6868
files:
@@ -83,9 +83,9 @@ providers:
8383
replacements:
8484
- old: "imagePullPolicy: Always"
8585
new: "imagePullPolicy: IfNotPresent"
86-
- name: v1.5.0-rc.1
86+
- name: v1.5.0
8787
# Use manifest from source files
88-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/control-plane-components.yaml"
88+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/control-plane-components.yaml"
8989
type: "url"
9090
contract: v1beta1
9191
files:

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
# - from the CAPV repository root, `make e2e` to build the vsphere provider image and run e2e tests.
1212

1313
images:
14-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-rc.1
14+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0
1515
loadBehavior: tryLoad
16-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-rc.1
16+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0
1717
loadBehavior: tryLoad
18-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-rc.1
18+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0
1919
loadBehavior: tryLoad
2020
- name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
2121
loadBehavior: mustLoad
@@ -40,9 +40,9 @@ providers:
4040
replacements:
4141
- old: "imagePullPolicy: Always"
4242
new: "imagePullPolicy: IfNotPresent"
43-
- name: v1.5.0-rc.1
43+
- name: v1.5.0
4444
# Use manifest from source files
45-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/core-components.yaml"
45+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/core-components.yaml"
4646
type: "url"
4747
contract: v1beta1
4848
files:
@@ -63,9 +63,9 @@ providers:
6363
replacements:
6464
- old: "imagePullPolicy: Always"
6565
new: "imagePullPolicy: IfNotPresent"
66-
- name: v1.5.0-rc.1
66+
- name: v1.5.0
6767
# Use manifest from source files
68-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/bootstrap-components.yaml"
68+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/bootstrap-components.yaml"
6969
type: "url"
7070
contract: v1beta1
7171
files:
@@ -86,9 +86,9 @@ providers:
8686
replacements:
8787
- old: "imagePullPolicy: Always"
8888
new: "imagePullPolicy: IfNotPresent"
89-
- name: v1.5.0-rc.1
89+
- name: v1.5.0
9090
# Use manifest from source files
91-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/control-plane-components.yaml"
91+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/control-plane-components.yaml"
9292
type: "url"
9393
contract: v1beta1
9494
files:

‎test/integration/integration-dev.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
# - from the CAPV repository root, `make e2e` to build the vsphere provider image and run e2e tests.
1212

1313
images:
14-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0-rc.1
14+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.5.0
1515
loadBehavior: tryLoad
16-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0-rc.1
16+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.5.0
1717
loadBehavior: tryLoad
18-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0-rc.1
18+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.5.0
1919
loadBehavior: tryLoad
2020
- name: gcr.io/k8s-staging-cluster-api/capv-manager:e2e
2121
loadBehavior: mustLoad
@@ -30,9 +30,9 @@ providers:
3030
- name: cluster-api
3131
type: CoreProvider
3232
versions:
33-
- name: v1.5.0-rc.1
33+
- name: v1.5.0
3434
# Use manifest from source files
35-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/core-components.yaml"
35+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/core-components.yaml"
3636
type: "url"
3737
contract: v1beta1
3838
files:
@@ -44,9 +44,9 @@ providers:
4444
- name: kubeadm
4545
type: BootstrapProvider
4646
versions:
47-
- name: v1.5.0-rc.1
47+
- name: v1.5.0
4848
# Use manifest from source files
49-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/bootstrap-components.yaml"
49+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/bootstrap-components.yaml"
5050
type: "url"
5151
contract: v1beta1
5252
files:
@@ -58,9 +58,9 @@ providers:
5858
- name: kubeadm
5959
type: ControlPlaneProvider
6060
versions:
61-
- name: v1.5.0-rc.1
61+
- name: v1.5.0
6262
# Use manifest from source files
63-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0-rc.1/control-plane-components.yaml"
63+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.0/control-plane-components.yaml"
6464
type: "url"
6565
contract: v1beta1
6666
files:

0 commit comments

Comments
 (0)