Skip to content

Commit d3cc590

Browse files
Prajyot-ParabPrajyot-Parab
authored
Bump go to v1.23 (#2258)
* Bump go to v1.23 Signed-off-by: Prajyot Parab <[email protected]> * Bump IBM/vpc-go-sdk to v0.65.0 Signed-off-by: Prajyot Parab <[email protected]> --------- Signed-off-by: Prajyot Parab <[email protected]>
1 parent 53ccde2 commit d3cc590

13 files changed

+67
-94
lines changed

‎.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ linters-settings:
121121
- whyNoLint
122122
- wrapperFunc
123123
unused:
124-
go: "1.22"
124+
go: "1.23"
125125
issues:
126126
max-same-issues: 0
127127
max-issues-per-linter: 0
@@ -207,7 +207,7 @@ issues:
207207
- "zz_generated.*\\.go$"
208208

209209
run:
210-
go: "1.22"
210+
go: "1.23"
211211
timeout: 10m
212212
build-tags:
213213
- tools

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RELEASE_DIR := out
6363
OUTPUT_TYPE ?= type=registry
6464

6565
# Go
66-
GO_VERSION ?=1.22.12
66+
GO_VERSION ?=1.23.7
6767
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
6868

6969
# kind

‎api/v1beta2/types.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,16 @@ type VPCLoadBalancerBackendPoolProtocol string
139139

140140
var (
141141
// VPCLoadBalancerBackendPoolProtocolHTTP is the string representing the http protocol for load balancer backend pools.
142-
VPCLoadBalancerBackendPoolProtocolHTTP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolHTTPConst
142+
VPCLoadBalancerBackendPoolProtocolHTTP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolHTTPConst
143143

144144
// VPCLoadBalancerBackendPoolProtocolHTTPS is the string representing the https protocol for load balancer backend pools.
145-
VPCLoadBalancerBackendPoolProtocolHTTPS VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolHTTPSConst
145+
VPCLoadBalancerBackendPoolProtocolHTTPS VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolHTTPSConst
146146

147147
// VPCLoadBalancerBackendPoolProtocolTCP is the string representing the tcp protocol for load balancer backend pools.
148-
VPCLoadBalancerBackendPoolProtocolTCP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolTCPConst
148+
VPCLoadBalancerBackendPoolProtocolTCP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolTCPConst
149149

150150
// VPCLoadBalancerBackendPoolProtocolUDP is the string representing the tudp protocol for load balancer backend pools.
151-
VPCLoadBalancerBackendPoolProtocolUDP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeProtocolUDPConst
151+
VPCLoadBalancerBackendPoolProtocolUDP VPCLoadBalancerBackendPoolProtocol = vpcv1.LoadBalancerPoolPrototypeLoadBalancerContextProtocolUDPConst
152152
)
153153

154154
// VPCLoadBalancerListenerProtocol describes the protocol for load balancer listeners.

‎cloud/scope/cluster.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ func (s *ClusterScope) CreateLoadBalancer() (*vpcv1.LoadBalancer, error) {
485485
return nil, fmt.Errorf("error subnet required for load balancer creation")
486486
}
487487

488-
options.SetPools([]vpcv1.LoadBalancerPoolPrototype{
488+
options.SetPools([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
489489
{
490490
Algorithm: core.StringPtr("round_robin"),
491491
HealthMonitor: &vpcv1.LoadBalancerPoolHealthMonitorPrototype{Delay: core.Int64Ptr(5), MaxRetries: core.Int64Ptr(2), Timeout: core.Int64Ptr(2), Type: core.StringPtr("tcp")},

‎cloud/scope/powervs_cluster.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,7 @@ func (s *PowerVSClusterScope) createLoadBalancer(lb infrav1beta2.VPCLoadBalancer
21732173
}
21742174
options.Subnets = append(options.Subnets, subnet)
21752175
}
2176-
options.SetPools([]vpcv1.LoadBalancerPoolPrototype{
2176+
options.SetPools([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
21772177
{
21782178
Algorithm: core.StringPtr("round_robin"),
21792179
HealthMonitor: &vpcv1.LoadBalancerPoolHealthMonitorPrototype{Delay: core.Int64Ptr(5), MaxRetries: core.Int64Ptr(2), Timeout: core.Int64Ptr(2), Type: core.StringPtr("tcp")},
@@ -2194,7 +2194,7 @@ func (s *PowerVSClusterScope) createLoadBalancer(lb infrav1beta2.VPCLoadBalancer
21942194
})
21952195

21962196
for _, additionalListeners := range lb.AdditionalListeners {
2197-
pool := vpcv1.LoadBalancerPoolPrototype{
2197+
pool := vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
21982198
Algorithm: core.StringPtr("round_robin"),
21992199
HealthMonitor: &vpcv1.LoadBalancerPoolHealthMonitorPrototype{Delay: core.Int64Ptr(5), MaxRetries: core.Int64Ptr(2), Timeout: core.Int64Ptr(2), Type: core.StringPtr("tcp")},
22002200
// Note: Appending port number to the name, it will be referenced to set target port while adding new pool member

‎cloud/scope/vpc_cluster.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1944,7 +1944,7 @@ func (s *VPCClusterScope) createLoadBalancer(loadBalancer infrav1beta2.VPCLoadBa
19441944
}
19451945

19461946
// Build the load balancer's backend pools.
1947-
backendPools := make([]vpcv1.LoadBalancerPoolPrototype, 0)
1947+
backendPools := make([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext, 0)
19481948
// If BackendPools is populated, use those. Otherwise, use default.
19491949
// TODO(cjschaef): Determine if a default Pool should be auto generated, or allow "empty" pools for LB's.
19501950
if loadBalancer.BackendPools != nil {
@@ -2082,7 +2082,7 @@ func (s *VPCClusterScope) getLoadBalancerSecurityGroupIDs(loadBalancer infrav1be
20822082
}
20832083

20842084
// buildLoadBalancerBackendPool will build a Load Balancer Pool based on the provided spec.
2085-
func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoadBalancerBackendPoolSpec) vpcv1.LoadBalancerPoolPrototype {
2085+
func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoadBalancerBackendPoolSpec) vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext {
20862086
monitor := &vpcv1.LoadBalancerPoolHealthMonitorPrototype{
20872087
Delay: ptr.To(pool.HealthMonitor.Delay),
20882088
MaxRetries: ptr.To(pool.HealthMonitor.Retries),
@@ -2095,7 +2095,7 @@ func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoad
20952095
if pool.HealthMonitor.URLPath != nil {
20962096
monitor.URLPath = pool.HealthMonitor.URLPath
20972097
}
2098-
backendPool := vpcv1.LoadBalancerPoolPrototype{
2098+
backendPool := vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext{
20992099
Algorithm: ptr.To(string(pool.Algorithm)),
21002100
HealthMonitor: monitor,
21012101
Protocol: ptr.To(string(pool.Protocol)),
@@ -2109,8 +2109,8 @@ func (s *VPCClusterScope) buildLoadBalancerBackendPool(pool infrav1beta2.VPCLoad
21092109
}
21102110

21112111
// getDefaultBalancerBackendPools returns a list of default Load Balancer Backend Pools for a Load Balancer.
2112-
func (s *VPCClusterScope) getDefaultLoadBalancerBackendPools() []vpcv1.LoadBalancerPoolPrototype {
2113-
defaultPools := make([]vpcv1.LoadBalancerPoolPrototype, 0)
2112+
func (s *VPCClusterScope) getDefaultLoadBalancerBackendPools() []vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext {
2113+
defaultPools := make([]vpcv1.LoadBalancerPoolPrototypeLoadBalancerContext, 0)
21142114

21152115
// For now, only one default pool is expected.
21162116
defaultPool := infrav1beta2.VPCLoadBalancerBackendPoolSpec{

‎go.mod

+12-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-ibmcloud
22

3-
go 1.22.0
4-
5-
toolchain go1.22.9
3+
go 1.23.2
64

75
// Keep these modules sync with sigs.k8s.io/cluster-api repository
86
replace (
@@ -13,11 +11,11 @@ replace (
1311

1412
require (
1513
github.com/IBM-Cloud/power-go-client v1.11.0
16-
github.com/IBM/go-sdk-core/v5 v5.18.5
17-
github.com/IBM/ibm-cos-sdk-go v1.12.1
18-
github.com/IBM/networking-go-sdk v0.45.0
19-
github.com/IBM/platform-services-go-sdk v0.77.1
20-
github.com/IBM/vpc-go-sdk v0.64.1
14+
github.com/IBM/go-sdk-core/v5 v5.19.0
15+
github.com/IBM/ibm-cos-sdk-go v1.12.2
16+
github.com/IBM/networking-go-sdk v0.51.2
17+
github.com/IBM/platform-services-go-sdk v0.79.0
18+
github.com/IBM/vpc-go-sdk v0.65.0
2119
github.com/blang/semver/v4 v4.0.0
2220
github.com/coreos/ignition/v2 v2.20.0
2321
github.com/go-logr/logr v1.4.2
@@ -32,9 +30,9 @@ require (
3230
github.com/spf13/pflag v1.0.6
3331
github.com/stretchr/testify v1.10.0
3432
go.uber.org/mock v0.5.0
35-
golang.org/x/crypto v0.33.0
36-
golang.org/x/net v0.35.0
37-
golang.org/x/text v0.22.0
33+
golang.org/x/crypto v0.36.0
34+
golang.org/x/net v0.37.0
35+
golang.org/x/text v0.23.0
3836
k8s.io/api v0.31.3
3937
k8s.io/apiextensions-apiserver v0.31.3
4038
k8s.io/apimachinery v0.31.3
@@ -170,9 +168,9 @@ require (
170168
go.uber.org/zap v1.27.0 // indirect
171169
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
172170
golang.org/x/oauth2 v0.24.0 // indirect
173-
golang.org/x/sync v0.11.0 // indirect
174-
golang.org/x/sys v0.30.0 // indirect
175-
golang.org/x/term v0.29.0 // indirect
171+
golang.org/x/sync v0.12.0 // indirect
172+
golang.org/x/sys v0.31.0 // indirect
173+
golang.org/x/term v0.30.0 // indirect
176174
golang.org/x/time v0.5.0 // indirect
177175
golang.org/x/tools v0.26.0 // indirect
178176
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

‎go.sum

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0
66
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
77
github.com/IBM-Cloud/power-go-client v1.11.0 h1:4xlYXF2+S3s6Crb0D2+d5c1kb6gUE7eowMXLB7Q6cWY=
88
github.com/IBM-Cloud/power-go-client v1.11.0/go.mod h1:UDyXeIKEp6r7yWUXYu3r0ZnFSlNZ2YeQTHwM2Tmlgv0=
9-
github.com/IBM/go-sdk-core/v5 v5.18.5 h1:g0JRl3sYXJczB/yuDlrN6x22LJ6jIxhp0Sa4ARNW60c=
10-
github.com/IBM/go-sdk-core/v5 v5.18.5/go.mod h1:KonTFRR+8ZSgw5cxBSYo6E4WZoY1+7n1kfHM82VcjFU=
11-
github.com/IBM/ibm-cos-sdk-go v1.12.1 h1:pWs5c5/j9PNJE1lIQhYtzpdCxu2fpvCq9PHs6/nDjyI=
12-
github.com/IBM/ibm-cos-sdk-go v1.12.1/go.mod h1:7vmUThyAq4+AD1eEyGZi90ir06Z9YhsEzLBsdGPfcqo=
13-
github.com/IBM/networking-go-sdk v0.45.0 h1:tYgDhVDpgKvELNY7tcodbZ4ny9fatpEWM6PwtQcDe20=
14-
github.com/IBM/networking-go-sdk v0.45.0/go.mod h1:NnJPA1e5GWr5opJe+5Hs6e1G6RcBIFz64TrkZsdnSp8=
15-
github.com/IBM/platform-services-go-sdk v0.77.1 h1:kOjbZTUBjcuzGJNwnd7jY0ZXXINKeCQx2tDJ52ZoyWg=
16-
github.com/IBM/platform-services-go-sdk v0.77.1/go.mod h1:sX7rPXMNqmAt6wQyjnF+oISRFwz6I6XNX9My/mzLqp4=
17-
github.com/IBM/vpc-go-sdk v0.64.1 h1:1tIeb+GqPnvw7Ty+M0BknZJIdzIIrHqxWsYjgrM6NQY=
18-
github.com/IBM/vpc-go-sdk v0.64.1/go.mod h1:6rEWo6HGt7S0Nbw7WdJQiVcz9Z+mRDmyycK4xc4kWlw=
9+
github.com/IBM/go-sdk-core/v5 v5.19.0 h1:YN2S5JUvq/EwYulmcNFwgyYBxZhVWl9nkY22H7Hpghw=
10+
github.com/IBM/go-sdk-core/v5 v5.19.0/go.mod h1:deZO1J5TSlU69bCnl/YV7nPxFZA2UEaup7cq/7ZTOgw=
11+
github.com/IBM/ibm-cos-sdk-go v1.12.2 h1:71A4tDl8u6BZ548h71ecEe7fw5bBA7ECTVqYmeSQWQA=
12+
github.com/IBM/ibm-cos-sdk-go v1.12.2/go.mod h1:ODYcmrmdpjo5hVguq9RbD6xmC8xb1XZMG7NefUbJNcc=
13+
github.com/IBM/networking-go-sdk v0.51.2 h1:aDa33IvvxMMWEB0sf+qNDWr8xE1XYoZYatG57SVsQAk=
14+
github.com/IBM/networking-go-sdk v0.51.2/go.mod h1:5aBaPKkm47LHECEOOZ4ltbwypOhapVo5aSCP3MTxmgQ=
15+
github.com/IBM/platform-services-go-sdk v0.79.0 h1:qCNheB3390holPcpDxdgNyi11JS6ZfsL39YgnJEOsTo=
16+
github.com/IBM/platform-services-go-sdk v0.79.0/go.mod h1:FzCPOfbNAt0s9RwtIrbJbfDwA7mKIObtZ/18KnviKr0=
17+
github.com/IBM/vpc-go-sdk v0.65.0 h1:wCOm4pPdrsPnnHlpLHrqntLdzEmyjafK5BfZdke/ntI=
18+
github.com/IBM/vpc-go-sdk v0.65.0/go.mod h1:VL7sy61ybg6tvA60SepoQx7TFe20m7JyNUt+se2tHP4=
1919
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
2020
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
2121
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -209,8 +209,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
209209
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
210210
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
211211
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
212-
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
213-
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
212+
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
213+
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
214214
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
215215
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
216216
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -395,8 +395,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
395395
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
396396
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
397397
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
398-
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
399-
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
398+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
399+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
400400
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
401401
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
402402
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -406,15 +406,15 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
406406
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
407407
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
408408
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
409-
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
410-
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
409+
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
410+
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
411411
golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
412412
golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
413413
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
414414
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
415415
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
416-
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
417-
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
416+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
417+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
418418
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
419419
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
420420
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -425,15 +425,15 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
425425
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
426426
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
427427
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
428-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
429-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
428+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
429+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
430430
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
431-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
432-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
431+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
432+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
433433
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
434434
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
435-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
436-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
435+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
436+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
437437
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
438438
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
439439
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎hack/ccm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Go
16-
GO_VERSION ?=1.22.12
16+
GO_VERSION ?=1.23.7
1717
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
1818

1919
REGISTRY=gcr.io/k8s-staging-capi-ibmcloud

‎hack/ensure-go.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ EOF
3131
local go_version
3232
IFS=" " read -ra go_version <<< "$(go version)"
3333
local minimum_go_version
34-
minimum_go_version=go1.22.0
34+
minimum_go_version=go1.23.0
3535
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
3636
cat <<EOF
3737
Detected go version: ${go_version[*]}.

‎hack/tools/go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools
22

3-
go 1.22.9
3+
go 1.23.0
44

55
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.5
66

@@ -13,7 +13,7 @@ require (
1313
github.com/onsi/ginkgo/v2 v2.22.0
1414
go.uber.org/mock v0.4.0
1515
golang.org/x/vuln v1.1.4
16-
gotest.tools/gotestsum v1.12.0
16+
gotest.tools/gotestsum v1.12.1
1717
k8s.io/code-generator v0.31.3
1818
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250214153822-068c0f3c8ed3
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387
@@ -190,7 +190,7 @@ require (
190190
github.com/fatih/structtag v1.2.0 // indirect
191191
github.com/felixge/httpsnoop v1.0.4 // indirect
192192
github.com/firefart/nonamedreturns v1.0.5 // indirect
193-
github.com/fsnotify/fsnotify v1.7.0 // indirect
193+
github.com/fsnotify/fsnotify v1.8.0 // indirect
194194
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
195195
github.com/fzipp/gocyclo v0.6.0 // indirect
196196
github.com/ghostiam/protogetter v0.3.6 // indirect
@@ -506,9 +506,9 @@ require (
506506
golang.org/x/net v0.34.0 // indirect
507507
golang.org/x/oauth2 v0.24.0 // indirect
508508
golang.org/x/sync v0.10.0 // indirect
509-
golang.org/x/sys v0.29.0 // indirect
509+
golang.org/x/sys v0.30.0 // indirect
510510
golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
511-
golang.org/x/term v0.28.0 // indirect
511+
golang.org/x/term v0.29.0 // indirect
512512
golang.org/x/text v0.21.0 // indirect
513513
golang.org/x/time v0.8.0 // indirect
514514
golang.org/x/tools v0.29.0 // indirect

0 commit comments

Comments
 (0)