Skip to content

Commit bd2090a

Browse files
Prajyot-ParabPrajyot-Parab
authored
Update cluster-api to v1.2.5 (#953)
Signed-off-by: Prajyot-Parab <[email protected]> Signed-off-by: Prajyot-Parab <[email protected]>
1 parent 4e214a8 commit bd2090a

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎go.mod

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

33
go 1.18
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.4
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.5
66

77
require (
88
github.com/IBM-Cloud/power-go-client v1.2.1
@@ -24,8 +24,8 @@ require (
2424
k8s.io/client-go v0.24.4
2525
k8s.io/klog/v2 v2.60.1
2626
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
27-
sigs.k8s.io/cluster-api v1.2.4
28-
sigs.k8s.io/cluster-api/test v1.2.4
27+
sigs.k8s.io/cluster-api v1.2.5
28+
sigs.k8s.io/cluster-api/test v1.2.5
2929
sigs.k8s.io/controller-runtime v0.12.3
3030
)
3131

@@ -53,7 +53,7 @@ require (
5353
github.com/docker/go-connections v0.4.0 // indirect
5454
github.com/docker/go-units v0.4.0 // indirect
5555
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
56-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
56+
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
5757
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
5858
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
5959
github.com/fsnotify/fsnotify v1.5.4 // indirect

‎go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
190190
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
191191
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
192192
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
193-
github.com/emicklei/go-restful v2.15.0+incompatible h1:8KpYO/Xl/ZudZs5RNOEhWMBY4hmzlZhhRd9cu+jrZP4=
194-
github.com/emicklei/go-restful v2.15.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
193+
github.com/emicklei/go-restful v2.16.0+incompatible h1:rgqiKNjTnFQA6kkhFe16D8epTksy9HQ1MyrbDXSdYhM=
194+
github.com/emicklei/go-restful v2.16.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
195195
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
196196
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
197197
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -1457,10 +1457,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
14571457
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
14581458
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
14591459
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
1460-
sigs.k8s.io/cluster-api v1.2.4 h1:wxfm/p8y+Q3qWVkkIPAIVqabA5lJVvqoRA02Nhup3uk=
1461-
sigs.k8s.io/cluster-api v1.2.4/go.mod h1:YaLJOC9mSsIOpdbh7BpthGmC8uxIJADzrMMIGpgahfM=
1462-
sigs.k8s.io/cluster-api/test v1.2.4 h1:hdYZ8HcQU2kYguE90EreRtzh7Zg6/tG9vW6JafdKX6M=
1463-
sigs.k8s.io/cluster-api/test v1.2.4/go.mod h1:C+UT2CXWNu3eAoeI0HHI19ex90pAdzAqR6YjhxRNHyM=
1460+
sigs.k8s.io/cluster-api v1.2.5 h1:Am4W5ITO0v5FUNkfCuD6gwE29phDt1gyQY9EGWnTYIU=
1461+
sigs.k8s.io/cluster-api v1.2.5/go.mod h1:Ye5gn15u+q6VcE+Se7nBMSo6INm55F+zBcCiWzrjxFc=
1462+
sigs.k8s.io/cluster-api/test v1.2.5 h1:oS5r0d7caFfu+w/2K1mFZXwA/jrkJcddlZHyW1sE7gs=
1463+
sigs.k8s.io/cluster-api/test v1.2.5/go.mod h1:uDGdxAADhTIuQoHoGSYehqMWKQ9sR4/LGE8y2k0Y2LM=
14641464
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
14651465
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
14661466
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=

‎hack/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/onsi/ginkgo v1.16.5
1212
gotest.tools/gotestsum v1.8.2
1313
k8s.io/code-generator v0.24.4
14-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221010120931-bb377163f141
14+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221107193018-cd87c3d90245
1515
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
1616
sigs.k8s.io/controller-tools v0.9.2
1717
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7

‎hack/tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,8 +1432,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
14321432
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
14331433
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
14341434
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
1435-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221010120931-bb377163f141 h1:oNHSGNGoVWVVdD5zXj2GUy71F2Ma+pDPrYnBRDNPvug=
1436-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221010120931-bb377163f141/go.mod h1:hJoKANoP/VEDT64J+z5/jL5rsmgGzl7xLXhbsmX6v1Q=
1435+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221107193018-cd87c3d90245 h1:910vXNXFIN+MMTe/XJKgOSNIW8z3H14eWs3hYwvsNCQ=
1436+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20221107193018-cd87c3d90245/go.mod h1:5xPkPId0uMezNzylNXdhnqpaPatPLHBbbVvLkTLlO+s=
14371437
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
14381438
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
14391439
sigs.k8s.io/controller-tools v0.9.2 h1:AkTE3QAdz9LS4iD3EJvHyYxBkg/g9fTbgiYsrcsFCcM=

‎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.2.4
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/core-components.yaml
12+
- name: v1.2.5
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/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.2.4
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/bootstrap-components.yaml
20+
- name: v1.2.5
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/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.2.4
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/control-plane-components.yaml
28+
- name: v1.2.5
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/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.2.4
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/core-components.yaml
12+
- name: v1.2.5
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/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.2.4
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/bootstrap-components.yaml
20+
- name: v1.2.5
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/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.2.4
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/control-plane-components.yaml
28+
- name: v1.2.5
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.5/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

0 commit comments

Comments
 (0)