Skip to content

Commit 6784864

Browse files
committed
chore: bump go to 1.26.1 and update the dependencies
1 parent 65aaafd commit 6784864

32 files changed

+250
-288
lines changed

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
- name: Checkout
2727
uses: actions/checkout@v4
2828

29-
- name: Setup Go 1.25
29+
- name: Setup Go 1.26
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: '1.25.5'
32+
go-version: '1.26.1'
3333

3434
- uses: azure/setup-kubectl@v4
3535
- uses: azure/setup-helm@v4.2.0

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/setup-go@v5
1212
with:
13-
go-version: 'stable'
13+
go-version: '1.26.1'
1414
- uses: actions/checkout@v4
1515
- name: golangci-lint
1616
run: make lint

.github/workflows/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
fetch-depth: 0
2222

23-
- name: Setup Go 1.25
23+
- name: Setup Go 1.26
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: '1.25.5'
26+
go-version: '1.26.1'
2727

2828
- name: Cache Go modules
2929
uses: actions/cache@v4

.github/workflows/pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424

25-
- name: Setup Go 1.25
25+
- name: Setup Go 1.26
2626
uses: actions/setup-go@v5
2727
with:
28-
go-version: '1.25.5'
28+
go-version: '1.26.1'
2929

3030
- name: Cache Go modules
3131
uses: actions/cache@v4

e2e/suites/gke.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"time"
1111

1212
"github.com/cenkalti/backoff/v4"
13-
"github.com/samber/lo"
1413
"github.com/stretchr/testify/require"
1514
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1615
"k8s.io/client-go/kubernetes"
@@ -132,7 +131,7 @@ func (ts *gkeTestSuite) Run(ctx context.Context, t *testing.T) {
132131
}, backoff.WithMaxRetries(backoff.NewConstantBackOff(5*time.Second), 12)))
133132

134133
drainResp, err := ts.castClient.ExternalClusterAPIDrainNodeWithResponse(ctx, *extCluster.Id, node.Id, client.ExternalclusterV1DrainConfig{
135-
TimeoutSeconds: lo.ToPtr(int32(60)),
134+
TimeoutSeconds: new(int32(60)),
136135
})
137136
r.NoError(err)
138137
r.NoError(ts.waitForOperation(ctx, drainResp.JSON200.OperationId, ts.drainNodeTimeout))

e2e/suites/suite.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"github.com/cenkalti/backoff/v4"
12-
"github.com/samber/lo"
1312
"github.com/stretchr/testify/require"
1413
appsv1 "k8s.io/api/apps/v1"
1514
corev1 "k8s.io/api/core/v1"
@@ -189,7 +188,7 @@ func (suite *baseSuite) onboardCluster(ctx context.Context, t *testing.T) *clien
189188
r := require.New(t)
190189

191190
agentScriptResp, err := suite.castClient.AutoscalerAPIGetAgentScript(ctx, &client.AutoscalerAPIGetAgentScriptParams{
192-
Provider: lo.ToPtr(client.AutoscalerAPIGetAgentScriptParamsProvider(suite.provider)),
191+
Provider: new(client.AutoscalerAPIGetAgentScriptParamsProvider(suite.provider)),
193192
})
194193

195194
r.NoError(err)
@@ -249,7 +248,7 @@ func (suite *baseSuite) cleanupCluster(ctx context.Context) error {
249248

250249
if cluster.CredentialsId != nil {
251250
if _, err := suite.castClient.ExternalClusterAPIDisconnectClusterWithResponse(ctx, *cluster.Id, client.ExternalclusterV1DisconnectConfig{
252-
DeleteProvisionedNodes: lo.ToPtr(true),
251+
DeleteProvisionedNodes: new(true),
253252
}); err != nil {
254253
return fmt.Errorf("disconnect cluster: %w", err)
255254
}
@@ -325,7 +324,7 @@ func getTestDeployment() *appsv1.Deployment {
325324
Namespace: "default",
326325
},
327326
Spec: appsv1.DeploymentSpec{
328-
Replicas: lo.ToPtr(int32(1)),
327+
Replicas: new(int32(1)),
329328
Selector: &metav1.LabelSelector{
330329
MatchLabels: map[string]string{
331330
"app": "nginx",

go.mod

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
module github.com/castai/cluster-controller
22

3-
go 1.25.6
3+
go 1.26.1
44

55
require (
66
github.com/bombsimon/logrusr/v4 v4.1.0
77
github.com/cenkalti/backoff/v4 v4.3.0
88
github.com/evanphx/json-patch v5.9.11+incompatible
99
github.com/fsnotify/fsnotify v1.9.0
10-
github.com/go-resty/resty/v2 v2.17.1
10+
github.com/go-resty/resty/v2 v2.17.2
1111
github.com/golang/mock v1.6.0
1212
github.com/google/uuid v1.6.0
1313
github.com/kelseyhightower/envconfig v1.4.0
1414
github.com/oapi-codegen/runtime v1.1.2
1515
github.com/prometheus/client_golang v1.23.2
1616
github.com/prometheus/client_model v0.6.2
17-
github.com/samber/lo v1.52.0
17+
github.com/samber/lo v1.53.0
1818
github.com/sirupsen/logrus v1.9.4
1919
github.com/spf13/cobra v1.10.2
2020
github.com/spf13/viper v1.21.0
2121
github.com/stretchr/testify v1.11.1
2222
go.uber.org/goleak v1.3.0
23-
golang.org/x/net v0.49.0
24-
golang.org/x/sync v0.19.0
23+
golang.org/x/net v0.51.0
24+
golang.org/x/sync v0.20.0
2525
helm.sh/helm/v3 v3.20.0
26-
k8s.io/api v0.35.0
27-
k8s.io/apiextensions-apiserver v0.35.0
28-
k8s.io/apimachinery v0.35.0
29-
k8s.io/apiserver v0.35.0
30-
k8s.io/cli-runtime v0.35.0
31-
k8s.io/client-go v0.35.0
32-
k8s.io/component-base v0.35.0
33-
k8s.io/klog/v2 v2.130.1
34-
k8s.io/kubectl v0.35.0
35-
sigs.k8s.io/controller-runtime v0.23.1
26+
k8s.io/api v0.35.2
27+
k8s.io/apiextensions-apiserver v0.35.2
28+
k8s.io/apimachinery v0.35.2
29+
k8s.io/apiserver v0.35.2
30+
k8s.io/cli-runtime v0.35.2
31+
k8s.io/client-go v0.35.2
32+
k8s.io/component-base v0.35.2
33+
k8s.io/klog/v2 v2.140.0
34+
k8s.io/kubectl v0.35.2
35+
sigs.k8s.io/controller-runtime v0.23.3
3636
sigs.k8s.io/yaml v1.6.0
3737
)
3838

@@ -52,8 +52,7 @@ require (
5252
github.com/blang/semver/v4 v4.0.0 // indirect
5353
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5454
github.com/chai2010/gettext-go v1.0.3 // indirect
55-
github.com/clipperhouse/stringish v0.1.1 // indirect
56-
github.com/clipperhouse/uax29/v2 v2.4.0 // indirect
55+
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
5756
github.com/containerd/containerd v1.7.30 // indirect
5857
github.com/containerd/errdefs v1.0.0 // indirect
5958
github.com/containerd/log v0.1.0 // indirect
@@ -70,20 +69,20 @@ require (
7069
github.com/go-errors/errors v1.5.1 // indirect
7170
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
7271
github.com/go-logr/logr v1.4.3 // indirect
73-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
74-
github.com/go-openapi/jsonreference v0.21.4 // indirect
75-
github.com/go-openapi/swag v0.25.4 // indirect
76-
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
77-
github.com/go-openapi/swag/conv v0.25.4 // indirect
78-
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
79-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
80-
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
81-
github.com/go-openapi/swag/loading v0.25.4 // indirect
82-
github.com/go-openapi/swag/mangling v0.25.4 // indirect
83-
github.com/go-openapi/swag/netutils v0.25.4 // indirect
84-
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
85-
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
86-
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
72+
github.com/go-openapi/jsonpointer v0.22.5 // indirect
73+
github.com/go-openapi/jsonreference v0.21.5 // indirect
74+
github.com/go-openapi/swag v0.25.5 // indirect
75+
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
76+
github.com/go-openapi/swag/conv v0.25.5 // indirect
77+
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
78+
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
79+
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
80+
github.com/go-openapi/swag/loading v0.25.5 // indirect
81+
github.com/go-openapi/swag/mangling v0.25.5 // indirect
82+
github.com/go-openapi/swag/netutils v0.25.5 // indirect
83+
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
84+
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
85+
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
8786
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
8887
github.com/gobwas/glob v0.2.3 // indirect
8988
github.com/google/btree v1.1.3 // indirect
@@ -97,14 +96,14 @@ require (
9796
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9897
github.com/jmoiron/sqlx v1.4.0 // indirect
9998
github.com/json-iterator/go v1.1.12 // indirect
100-
github.com/klauspost/compress v1.18.3 // indirect
99+
github.com/klauspost/compress v1.18.4 // indirect
101100
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
102101
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
103-
github.com/lib/pq v1.11.1 // indirect
102+
github.com/lib/pq v1.11.2 // indirect
104103
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
105104
github.com/mattn/go-colorable v0.1.14 // indirect
106105
github.com/mattn/go-isatty v0.0.20 // indirect
107-
github.com/mattn/go-runewidth v0.0.19 // indirect
106+
github.com/mattn/go-runewidth v0.0.21 // indirect
108107
github.com/mitchellh/copystructure v1.2.0 // indirect
109108
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
110109
github.com/mitchellh/reflectwalk v1.0.2 // indirect
@@ -120,7 +119,7 @@ require (
120119
github.com/pkg/errors v0.9.1 // indirect
121120
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
122121
github.com/prometheus/common v0.67.5 // indirect
123-
github.com/prometheus/procfs v0.19.2 // indirect
122+
github.com/prometheus/procfs v0.20.1 // indirect
124123
github.com/rubenv/sql-migrate v1.8.1 // indirect
125124
github.com/russross/blackfriday/v2 v2.1.0 // indirect
126125
github.com/sagikazarmark/locafero v0.12.0 // indirect
@@ -133,29 +132,28 @@ require (
133132
github.com/x448/float16 v0.8.4 // indirect
134133
github.com/xlab/treeprint v1.2.0 // indirect
135134
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
136-
go.opentelemetry.io/otel v1.39.0 // indirect
137-
go.opentelemetry.io/otel/trace v1.39.0 // indirect
138-
go.yaml.in/yaml/v2 v2.4.3 // indirect
135+
go.opentelemetry.io/otel v1.42.0 // indirect
136+
go.opentelemetry.io/otel/trace v1.42.0 // indirect
137+
go.yaml.in/yaml/v2 v2.4.4 // indirect
139138
go.yaml.in/yaml/v3 v3.0.4 // indirect
140-
golang.org/x/crypto v0.47.0 // indirect
141-
golang.org/x/oauth2 v0.34.0 // indirect
142-
golang.org/x/sys v0.40.0 // indirect
143-
golang.org/x/term v0.39.0 // indirect
144-
golang.org/x/text v0.33.0 // indirect
145-
golang.org/x/time v0.14.0 // indirect
146-
golang.org/x/tools v0.41.0 // indirect
147-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
148-
google.golang.org/grpc v1.78.0 // indirect
139+
golang.org/x/crypto v0.48.0 // indirect
140+
golang.org/x/oauth2 v0.36.0 // indirect
141+
golang.org/x/sys v0.42.0 // indirect
142+
golang.org/x/term v0.40.0 // indirect
143+
golang.org/x/text v0.34.0 // indirect
144+
golang.org/x/time v0.15.0 // indirect
145+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
146+
google.golang.org/grpc v1.79.2 // indirect
149147
google.golang.org/protobuf v1.36.11 // indirect
150148
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
151149
gopkg.in/inf.v0 v0.9.1 // indirect
152150
gopkg.in/yaml.v3 v3.0.1 // indirect
153-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
154-
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
151+
k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf // indirect
152+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
155153
oras.land/oras-go/v2 v2.6.0 // indirect
156154
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
157-
sigs.k8s.io/kustomize/api v0.21.0 // indirect
158-
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
155+
sigs.k8s.io/kustomize/api v0.21.1 // indirect
156+
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
159157
sigs.k8s.io/randfill v1.0.0 // indirect
160-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
158+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
161159
)

0 commit comments

Comments
 (0)