Skip to content

Commit 6ba5333

Browse files
Amulyam24Amulyam24
authored
Update dependencies (#1299)
1 parent 3e8a805 commit 6ba5333

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ PULL_POLICY ?= Always
6767
# Set build time variables including version details
6868
LDFLAGS := $(shell ./hack/version.sh)
6969

70-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.24.1
70+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.26.1
7171

7272
# main controller
7373
CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ go 1.19
66
replace (
77
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.9.2
88
github.com/onsi/gomega => github.com/onsi/gomega v1.27.5
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.3
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.4
1010
)
1111

1212
require (
1313
github.com/IBM-Cloud/power-go-client v1.2.3
14-
github.com/IBM/go-sdk-core/v5 v5.13.2
15-
github.com/IBM/platform-services-go-sdk v0.37.3
16-
github.com/IBM/vpc-go-sdk v0.36.0
17-
github.com/go-logr/logr v1.2.3
14+
github.com/IBM/go-sdk-core/v5 v5.13.4
15+
github.com/IBM/platform-services-go-sdk v0.41.0
16+
github.com/IBM/vpc-go-sdk v0.40.0
17+
github.com/go-logr/logr v1.2.4
1818
github.com/go-openapi/strfmt v0.21.7
1919
github.com/golang-jwt/jwt v3.2.2+incompatible
2020
github.com/golang/mock v1.6.0
@@ -34,8 +34,8 @@ require (
3434
k8s.io/client-go v0.26.1
3535
k8s.io/klog/v2 v2.80.1
3636
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
37-
sigs.k8s.io/cluster-api v1.4.3
38-
sigs.k8s.io/cluster-api/test v1.4.3
37+
sigs.k8s.io/cluster-api v1.4.4
38+
sigs.k8s.io/cluster-api/test v1.4.4
3939
sigs.k8s.io/controller-runtime v0.14.5
4040
)
4141

@@ -150,7 +150,7 @@ require (
150150
k8s.io/component-base v0.26.1 // indirect
151151
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
152152
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
153-
sigs.k8s.io/kind v0.18.0 // indirect
153+
sigs.k8s.io/kind v0.20.0 // indirect
154154
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
155155
sigs.k8s.io/yaml v1.3.0 // indirect
156156
)

‎go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
4444
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4545
github.com/IBM-Cloud/power-go-client v1.2.3 h1:Scx70PyqpKv3zS/kJeMEg0qOOmsG6cM3bueiAYcCgXI=
4646
github.com/IBM-Cloud/power-go-client v1.2.3/go.mod h1:Qfx0fNi+9hms+xu9Z6Euhu9088ByW6C/TCMLECTRWNE=
47-
github.com/IBM/go-sdk-core/v5 v5.13.2 h1:C/JWnEadKzonoHFZdMX8DaSxGVqKRFhcpDXFS5bPDiA=
48-
github.com/IBM/go-sdk-core/v5 v5.13.2/go.mod h1:gKRSB+YyKsGlRQW7v5frlLbue5afulSvrRa4O26o4MM=
49-
github.com/IBM/platform-services-go-sdk v0.37.3 h1:xPJ7M6F+Qmd+4IOMn2eM/UHy2Y1iHB2jRBrKynJA7QE=
50-
github.com/IBM/platform-services-go-sdk v0.37.3/go.mod h1:oFW/DQyAXGBcGytB+DtKjE3yNdEGM2bmw5SDOjrRwTw=
51-
github.com/IBM/vpc-go-sdk v0.36.0 h1:ceUI+AaZ3cSKvfg9MjfW5lVO8YnJN6IuVC3YyXX+Yng=
52-
github.com/IBM/vpc-go-sdk v0.36.0/go.mod h1:MgZrbITC067AlcE5oy4hwylasFvrePL4RVxeF6GTdKQ=
47+
github.com/IBM/go-sdk-core/v5 v5.13.4 h1:kJvBNQOwhFRkXCPapjNvKVC7n7n2vd1Nr6uUtDZGcfo=
48+
github.com/IBM/go-sdk-core/v5 v5.13.4/go.mod h1:gKRSB+YyKsGlRQW7v5frlLbue5afulSvrRa4O26o4MM=
49+
github.com/IBM/platform-services-go-sdk v0.41.0 h1:2aeHcLnQgat7UAKrtIF6jGyFW2hwq4oroO26fIX94kA=
50+
github.com/IBM/platform-services-go-sdk v0.41.0/go.mod h1:rb1IaHGwT8QI8pCYgNbf2VbkuKMgOowl91pZ2QWZuJ4=
51+
github.com/IBM/vpc-go-sdk v0.40.0 h1:p4E1dIQc6+WmqLwRTzgWA2udqFw6nypOg+8R0WxTgX0=
52+
github.com/IBM/vpc-go-sdk v0.40.0/go.mod h1:MgZrbITC067AlcE5oy4hwylasFvrePL4RVxeF6GTdKQ=
5353
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
5454
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
5555
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -179,8 +179,8 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V
179179
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
180180
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
181181
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
182-
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
183-
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
182+
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
183+
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
184184
github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
185185
github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
186186
github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
@@ -1200,16 +1200,16 @@ 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.3 h1:QSeKr3qnWPtVp+EMQZQduKoi5WDwUhAtBRreEukkcy0=
1204-
sigs.k8s.io/cluster-api v1.4.3/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
1205-
sigs.k8s.io/cluster-api/test v1.4.3 h1:xXhvOLp5zBKn2Yf4PQckFwxGxFrKgkgUI74ikU5Jh/c=
1206-
sigs.k8s.io/cluster-api/test v1.4.3/go.mod h1:xGTJsJkbXMNmumhErEAH/e7GmnE2sGfm/rcOzJZSdbw=
1203+
sigs.k8s.io/cluster-api v1.4.4 h1:+V+mzDe+gsWYclosvWlH0wadC8vIUsBvZLcWOYnVWRA=
1204+
sigs.k8s.io/cluster-api v1.4.4/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
1205+
sigs.k8s.io/cluster-api/test v1.4.4 h1:EhZqbMJ9uY0mptUnSax44FzaScphtCU91LxJq0qfCrI=
1206+
sigs.k8s.io/cluster-api/test v1.4.4/go.mod h1:wF8xhW4V0D+Gfrm5uZk57I0up+8WUQNpB2dNTJ1aTiI=
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=
12101210
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
1211-
sigs.k8s.io/kind v0.18.0 h1:ahgZdVV1pdhXlYe1f+ztISakT23KdrBl/NFY9JMygzs=
1212-
sigs.k8s.io/kind v0.18.0/go.mod h1:Qqp8AiwOlMZmJWs37Hgs31xcbiYXjtXlRBSftcnZXQk=
1211+
sigs.k8s.io/kind v0.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8=
1212+
sigs.k8s.io/kind v0.20.0/go.mod h1:aBlbxg08cauDgZ612shr017/rZwqd7AS563FvpWKPVs=
12131213
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
12141214
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
12151215
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=

‎hack/ensure-kind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set -o pipefail
2121
set -x
2222

2323
GOPATH_BIN="$(go env GOPATH)/bin/"
24-
MINIMUM_KIND_VERSION=v0.11.0
24+
MINIMUM_KIND_VERSION=v0.18.0
2525

2626
# Ensure the kind tool exists and is a viable version, or installs it
2727
verify_kind_version() {

‎hack/ensure-kubectl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ set -o nounset
1919
set -o pipefail
2020

2121
GOPATH_BIN="$(go env GOPATH)/bin/"
22-
MINIMUM_KUBECTL_VERSION=v1.19.0
22+
MINIMUM_KUBECTL_VERSION=v1.26.0
2323

2424
# Ensure the kubectl tool exists and is a viable version, or installs it
2525
verify_kubectl_version() {

‎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.3
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.4
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.2
1414
gotest.tools/gotestsum v1.10.0
1515
k8s.io/code-generator v0.26.1
16-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230601111148-14b88ca09110
16+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230627102031-00dbf7b9f632
1717
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
1818
sigs.k8s.io/controller-tools v0.11.4
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
@@ -1222,10 +1222,10 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RF
12221222
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
12231223
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
12241224
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1225-
sigs.k8s.io/cluster-api v1.4.3 h1:QSeKr3qnWPtVp+EMQZQduKoi5WDwUhAtBRreEukkcy0=
1226-
sigs.k8s.io/cluster-api v1.4.3/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
1227-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230601111148-14b88ca09110 h1:wBXi6sQdRncwU4bBykIsKgYVl6p28Oa9NaxM8B1QiQY=
1228-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230601111148-14b88ca09110/go.mod h1:ME2hVA5Z3etKTvL/LC5NtsDE2FUTZmgxgfGKQj4/luo=
1225+
sigs.k8s.io/cluster-api v1.4.4 h1:+V+mzDe+gsWYclosvWlH0wadC8vIUsBvZLcWOYnVWRA=
1226+
sigs.k8s.io/cluster-api v1.4.4/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
1227+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230627102031-00dbf7b9f632 h1:rszYVuKDVgWZbzu5ZahFlR+dCSV3uIzfWurN/l55A14=
1228+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230627102031-00dbf7b9f632/go.mod h1:ME2hVA5Z3etKTvL/LC5NtsDE2FUTZmgxgfGKQj4/luo=
12291229
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
12301230
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
12311231
sigs.k8s.io/controller-tools v0.11.4 h1:jqXJ/Xb6yBgbgcBbw1YoC3rC+Bt1XZWiLjj0ZHv/GrU=

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

0 commit comments

Comments
 (0)