Skip to content

Commit 6a03389

Browse files
authored
Update cluster-api to v1.4.0 (#1177)
1 parent c60af05 commit 6a03389

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.19
66
replace (
77
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.9.1
88
github.com/onsi/gomega => github.com/onsi/gomega v1.27.4
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.0-rc.0
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.0
1010
)
1111

1212
require (
@@ -33,8 +33,8 @@ require (
3333
k8s.io/client-go v0.26.1
3434
k8s.io/klog/v2 v2.80.1
3535
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
36-
sigs.k8s.io/cluster-api v1.4.0-rc.0
37-
sigs.k8s.io/cluster-api/test v1.4.0-rc.0
36+
sigs.k8s.io/cluster-api v1.4.0
37+
sigs.k8s.io/cluster-api/test v1.4.0
3838
sigs.k8s.io/controller-runtime v0.14.5
3939
)
4040

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,10 +1200,10 @@ k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt
12001200
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12011201
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12021202
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1203-
sigs.k8s.io/cluster-api v1.4.0-rc.0 h1:MzqOwbjmOb7XnYsjwo1eNijYhzbTWf1TfjJZ7nKQI+s=
1204-
sigs.k8s.io/cluster-api v1.4.0-rc.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
1205-
sigs.k8s.io/cluster-api/test v1.4.0-rc.0 h1:8TIV8282QXcfDlLd1S58oGfKOwh7CRA6V+uLBhIRS24=
1206-
sigs.k8s.io/cluster-api/test v1.4.0-rc.0/go.mod h1:IR6swYJ/bHq2XMhUwLR051vPlRNL5Wsjie/4s3+QRaQ=
1203+
sigs.k8s.io/cluster-api v1.4.0 h1:qkFt+yie4kDJQY4qD67rJR/S2dQ1IBZr/B2moYeVzWI=
1204+
sigs.k8s.io/cluster-api v1.4.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
1205+
sigs.k8s.io/cluster-api/test v1.4.0 h1:oUPPm4QG827iSUAB/341B72wsvnIRy95t8cE74zMtCY=
1206+
sigs.k8s.io/cluster-api/test v1.4.0/go.mod h1:IR6swYJ/bHq2XMhUwLR051vPlRNL5Wsjie/4s3+QRaQ=
12071207
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
12081208
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
12091209
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

hack/tools/go.mod

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

33
go 1.19
44

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

77
require (
88
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
@@ -13,7 +13,7 @@ require (
1313
github.com/onsi/ginkgo/v2 v2.9.1
1414
gotest.tools/gotestsum v1.8.2
1515
k8s.io/code-generator v0.26.1
16-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230314140816-47193a3b994d
16+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230328130021-2c0771782941
1717
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
1818
sigs.k8s.io/controller-tools v0.11.3
1919
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7

hack/tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,10 +1220,10 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RF
12201220
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12211221
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12221222
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1223-
sigs.k8s.io/cluster-api v1.4.0-rc.0 h1:MzqOwbjmOb7XnYsjwo1eNijYhzbTWf1TfjJZ7nKQI+s=
1224-
sigs.k8s.io/cluster-api v1.4.0-rc.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
1225-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230314140816-47193a3b994d h1:zC9GR2H+dH5QeEPahEvCebSKdG+2vCcWXR9FUjNh36k=
1226-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230314140816-47193a3b994d/go.mod h1:wPzTJUNCrzspp367YIpqZPqditXEyktxuTVQRf3suWs=
1223+
sigs.k8s.io/cluster-api v1.4.0 h1:qkFt+yie4kDJQY4qD67rJR/S2dQ1IBZr/B2moYeVzWI=
1224+
sigs.k8s.io/cluster-api v1.4.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
1225+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230328130021-2c0771782941 h1:A7SfLmz0k3GmSS1Cs/EtPSDziOPKM022CvC6Qwcn7aY=
1226+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230328130021-2c0771782941/go.mod h1:wPzTJUNCrzspp367YIpqZPqditXEyktxuTVQRf3suWs=
12271227
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
12281228
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
12291229
sigs.k8s.io/controller-tools v0.11.3 h1:T1xzLkog9saiyQSLz1XOImu4OcbdXWytc5cmYsBeBiE=

test/e2e/config/ibmcloud-e2e-powervs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.4.0-rc.0
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/core-components.yaml
12+
- name: v1.4.0
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.4.0-rc.0
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/bootstrap-components.yaml
20+
- name: v1.4.0
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.4.0-rc.0
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/control-plane-components.yaml
28+
- name: v1.4.0
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

test/e2e/config/ibmcloud-e2e-vpc.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.4.0-rc.0
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/core-components.yaml
12+
- name: v1.4.0
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.4.0-rc.0
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/bootstrap-components.yaml
20+
- name: v1.4.0
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.4.0-rc.0
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/control-plane-components.yaml
28+
- name: v1.4.0
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

0 commit comments

Comments
 (0)