Skip to content

Commit 3e64b42

Browse files
Prajyot-ParabPrajyot-Parab
authored
Update cluster-api to v1.5.0 (#1312)
Signed-off-by: Prajyot-Parab <[email protected]>
1 parent 46232f1 commit 3e64b42

File tree

6 files changed

+31
-35
lines changed

6 files changed

+31
-35
lines changed

‎go.mod

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.20
66
replace (
77
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.11.0
88
github.com/onsi/gomega => github.com/onsi/gomega v1.27.8
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0-rc.1
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.0
1010
)
1111

1212
require (
@@ -34,8 +34,8 @@ require (
3434
k8s.io/client-go v0.27.2
3535
k8s.io/klog/v2 v2.90.1
3636
k8s.io/utils v0.0.0-20230209194617-a36077c30491
37-
sigs.k8s.io/cluster-api v1.5.0-rc.1
38-
sigs.k8s.io/cluster-api/test v1.5.0-rc.1
37+
sigs.k8s.io/cluster-api v1.5.0
38+
sigs.k8s.io/cluster-api/test v1.5.0
3939
sigs.k8s.io/controller-runtime v0.15.0
4040
)
4141

@@ -58,11 +58,11 @@ require (
5858
github.com/coredns/corefile-migration v1.0.20 // indirect
5959
github.com/davecgh/go-spew v1.1.1 // indirect
6060
github.com/docker/distribution v2.8.2+incompatible // indirect
61-
github.com/docker/docker v20.10.24+incompatible // indirect
61+
github.com/docker/docker v24.0.5+incompatible // indirect
6262
github.com/docker/go-connections v0.4.0 // indirect
6363
github.com/docker/go-units v0.4.0 // indirect
6464
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
65-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
65+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
6666
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6767
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
6868
github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -124,7 +124,6 @@ require (
124124
github.com/prometheus/common v0.42.0 // indirect
125125
github.com/prometheus/procfs v0.10.1 // indirect
126126
github.com/shopspring/decimal v1.3.1 // indirect
127-
github.com/sirupsen/logrus v1.9.0 // indirect
128127
github.com/spf13/afero v1.9.5 // indirect
129128
github.com/spf13/cast v1.5.1 // indirect
130129
github.com/spf13/jwalterweatherman v1.1.0 // indirect

‎go.sum

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
130130
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
131131
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
132132
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
133-
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
134-
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
133+
github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
134+
github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
135135
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
136136
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
137137
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -140,8 +140,8 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD
140140
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
141141
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 h1:7QPwrLT79GlD5sizHf27aoY2RTvw62mO6x7mxkScNk0=
142142
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46/go.mod h1:esf2rsHFNlZlxsqsZDojNBcnNs5REqIvRrWRHqX0vEU=
143-
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
144-
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
143+
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
144+
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
145145
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
146146
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
147147
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -617,8 +617,6 @@ github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
617617
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
618618
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
619619
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
620-
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
621-
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
622620
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
623621
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
624622
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -902,7 +900,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
902900
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
903901
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
904902
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
905-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
906903
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
907904
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
908905
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1167,10 +1164,10 @@ k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt
11671164
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
11681165
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
11691166
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1170-
sigs.k8s.io/cluster-api v1.5.0-rc.1 h1:pLaRjFlknMWMKzippA+Dm2HXmONubAicSujFhsO2pzo=
1171-
sigs.k8s.io/cluster-api v1.5.0-rc.1/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
1172-
sigs.k8s.io/cluster-api/test v1.5.0-rc.1 h1:jFqe7FH0z9dbuHUADHKLrDlc8TLeLFFCETlNOhSU4Q0=
1173-
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=
11741171
sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
11751172
sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
11761173
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎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.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/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
@@ -13,7 +13,7 @@ require (
1313
github.com/onsi/ginkgo/v2 v2.11.0
1414
gotest.tools/gotestsum v1.10.1
1515
k8s.io/code-generator v0.27.2
16-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230717191311-038b533a1200
16+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230725081405-4abf44cd85c4
1717
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
1818
sigs.k8s.io/controller-tools v0.12.0
1919
sigs.k8s.io/kustomize/kustomize/v5 v5.1.0

‎hack/tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,10 +1193,10 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RF
11931193
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
11941194
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
11951195
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1196-
sigs.k8s.io/cluster-api v1.5.0-rc.1 h1:pLaRjFlknMWMKzippA+Dm2HXmONubAicSujFhsO2pzo=
1197-
sigs.k8s.io/cluster-api v1.5.0-rc.1/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
1198-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230717191311-038b533a1200 h1:RX5Ph2ZFn757RiOFr/Ksmd6ij7SFxqMRFf880WTuS8s=
1199-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230717191311-038b533a1200/go.mod h1:7o6wiVgH96FfrzR8KyAYyGrtxbtpd8gnv7Bmjw4RHAc=
1196+
sigs.k8s.io/cluster-api v1.5.0 h1:pwXvzScbAwnrB7EWHTApzW+VQfrj2OSrWAQDC9+bcbU=
1197+
sigs.k8s.io/cluster-api v1.5.0/go.mod h1:ZSEP01t8oT6104gB4ljsOwwp5uJcI8SWy8IFp2HUvrc=
1198+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230725081405-4abf44cd85c4 h1:UyGJPYFiGaORbm9/FN+DEKsVFrVz/IjRqnjXAX9+Wg4=
1199+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230725081405-4abf44cd85c4/go.mod h1:OKL9blzl8lz8MfZGx5np0raC/MRimDKmAMkKGgK5iWs=
12001200
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
12011201
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
12021202
sigs.k8s.io/controller-tools v0.12.0 h1:TY6CGE6+6hzO7hhJFte65ud3cFmmZW947jajXkuDfBw=

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

0 commit comments

Comments
 (0)