Skip to content

Commit 6fa5679

Browse files
pmatseykanetspmatseykanets
authored
Bump dependencies (#564)
* Bump Go to 1.26.1 * Update k8s to v1.35.1 * Bump CAPI from v1beta1 to v1beta2 * Bump rancher to main HEAD * Bump golangci-lint to v2.7.2 * Update GOTOOLCHAIN env for unit tests * Bump golangci-lint to 2.11.3
1 parent d13824b commit 6fa5679

File tree

6 files changed

+138
-170
lines changed

6 files changed

+138
-170
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
cache: false
2222
# https://github.com/golang/go/issues/75031
2323
- name: Set toolchain version
24-
run: go env -w GOTOOLCHAIN=go1.25.4+auto
24+
run: go env -w GOTOOLCHAIN=go1.26.1+auto
2525

2626
- name: Lint
27-
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
27+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
2828
with:
29-
version: v2.7.1
29+
version: v2.11.3
3030

3131
- name: Validate Go modules
3232
run: ./scripts/validate

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343

4444
# https://github.com/golang/go/issues/75031
4545
- name: Set toolchain version
46-
run: go env -w GOTOOLCHAIN=go1.25.6+auto
46+
run: go env -w GOTOOLCHAIN=go1.26.1+auto
4747

4848
- name: Lint
49-
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
49+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
5050
with:
51-
version: v2.7.1
51+
version: v2.11.3
5252

5353
- name: Validate Go modules
5454
run: ./scripts/validate

‎cliclient/cliclient.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/rancher/cli/config"
99
"github.com/rancher/norman/clientbase"
1010
ntypes "github.com/rancher/norman/types"
11-
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1"
11+
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta2"
1212
clusterClient "github.com/rancher/rancher/pkg/client/generated/cluster/v3"
1313
managementClient "github.com/rancher/rancher/pkg/client/generated/management/v3"
1414
projectClient "github.com/rancher/rancher/pkg/client/generated/project/v3"

‎cmd/machine.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55

66
"github.com/rancher/cli/cliclient"
7-
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta1"
7+
capiClient "github.com/rancher/rancher/pkg/client/generated/cluster/v1beta2"
88
"github.com/urfave/cli"
99
)
1010

‎go.mod‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
module github.com/rancher/cli
22

3-
go 1.25.0
3+
go 1.26.0
44

5-
toolchain go1.25.6
5+
toolchain go1.26.1
66

77
replace (
8-
k8s.io/apiserver => k8s.io/apiserver v0.34.3
9-
k8s.io/client-go => k8s.io/client-go v0.34.3
10-
k8s.io/component-base => k8s.io/component-base v0.34.3
11-
k8s.io/kubernetes => k8s.io/kubernetes v1.34.3
8+
k8s.io/apiserver => k8s.io/apiserver v0.35.1
9+
k8s.io/client-go => k8s.io/client-go v0.35.1
10+
k8s.io/component-base => k8s.io/component-base v0.35.1
11+
k8s.io/kubernetes => k8s.io/kubernetes v1.35.1
1212
)
1313

1414
require (
1515
github.com/ghodss/yaml v1.0.0
16-
github.com/rancher/norman v0.8.1
17-
github.com/rancher/rancher/pkg/apis v0.0.0-20260109182643-230c7fbdae00
18-
github.com/rancher/rancher/pkg/client v0.0.0-20260109182643-230c7fbdae00
16+
github.com/rancher/norman v0.8.4
17+
github.com/rancher/rancher/pkg/apis v0.0.0-20260310194613-d3fd02f2a6df
18+
github.com/rancher/rancher/pkg/client v0.0.0-20260310194613-d3fd02f2a6df
1919
github.com/sirupsen/logrus v1.9.4
2020
github.com/stretchr/testify v1.11.1
2121
github.com/tidwall/gjson v1.17.0
2222
github.com/urfave/cli v1.22.17
2323
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
24-
golang.org/x/oauth2 v0.32.0
25-
golang.org/x/sync v0.17.0
26-
golang.org/x/term v0.36.0
27-
golang.org/x/text v0.30.0
24+
golang.org/x/oauth2 v0.35.0
25+
golang.org/x/sync v0.19.0
26+
golang.org/x/term v0.40.0
27+
golang.org/x/text v0.34.0
2828
k8s.io/client-go v12.0.0+incompatible
2929
)
3030

@@ -34,13 +34,12 @@ require (
3434
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3535
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
3636
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
37-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
37+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3838
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3939
github.com/go-logr/logr v1.4.3 // indirect
4040
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4141
github.com/go-openapi/jsonreference v0.21.0 // indirect
4242
github.com/go-openapi/swag v0.23.0 // indirect
43-
github.com/gogo/protobuf v1.3.2 // indirect
4443
github.com/google/gnostic-models v0.7.0 // indirect
4544
github.com/google/go-cmp v0.7.0 // indirect
4645
github.com/google/uuid v1.6.0 // indirect
@@ -53,44 +52,44 @@ require (
5352
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5453
github.com/pkg/errors v0.9.1 // indirect
5554
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
56-
github.com/prometheus/client_golang v1.22.0 // indirect
57-
github.com/prometheus/client_model v0.6.1 // indirect
58-
github.com/prometheus/common v0.62.0 // indirect
59-
github.com/prometheus/procfs v0.15.1 // indirect
60-
github.com/rancher/aks-operator v1.13.0-rc.4 // indirect
61-
github.com/rancher/ali-operator v1.13.0-rc.2 // indirect
62-
github.com/rancher/eks-operator v1.13.0-rc.4 // indirect
63-
github.com/rancher/fleet/pkg/apis v0.15.0-alpha.4 // indirect
64-
github.com/rancher/gke-operator v1.13.0-rc.3 // indirect
65-
github.com/rancher/lasso v0.2.5 // indirect
55+
github.com/prometheus/client_golang v1.23.2 // indirect
56+
github.com/prometheus/client_model v0.6.2 // indirect
57+
github.com/prometheus/common v0.66.1 // indirect
58+
github.com/prometheus/procfs v0.16.1 // indirect
59+
github.com/rancher/aks-operator v1.14.0-rc.2 // indirect
60+
github.com/rancher/ali-operator v1.14.0-rc.1 // indirect
61+
github.com/rancher/eks-operator v1.14.0-rc.5 // indirect
62+
github.com/rancher/fleet/pkg/apis v0.15.0-beta.4 // indirect
63+
github.com/rancher/gke-operator v1.14.0-rc.3 // indirect
64+
github.com/rancher/lasso v0.2.7 // indirect
6665
github.com/rancher/rke v1.8.0 // indirect
67-
github.com/rancher/wrangler/v3 v3.3.1 // indirect
66+
github.com/rancher/wrangler/v3 v3.5.0-rc.2 // indirect
6867
github.com/russross/blackfriday/v2 v2.1.0 // indirect
69-
github.com/spf13/pflag v1.0.6 // indirect
68+
github.com/spf13/pflag v1.0.10 // indirect
7069
github.com/tidwall/match v1.1.1 // indirect
7170
github.com/tidwall/pretty v1.2.0 // indirect
7271
github.com/x448/float16 v0.8.4 // indirect
73-
go.opentelemetry.io/otel v1.37.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
75-
go.yaml.in/yaml/v2 v2.4.2 // indirect
72+
go.opentelemetry.io/otel v1.39.0 // indirect
73+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
74+
go.yaml.in/yaml/v2 v2.4.3 // indirect
7675
go.yaml.in/yaml/v3 v3.0.4 // indirect
77-
golang.org/x/net v0.46.0 // indirect
78-
golang.org/x/sys v0.37.0 // indirect
79-
golang.org/x/time v0.13.0 // indirect
80-
google.golang.org/protobuf v1.36.10 // indirect
76+
golang.org/x/net v0.51.0 // indirect
77+
golang.org/x/sys v0.41.0 // indirect
78+
golang.org/x/time v0.14.0 // indirect
79+
google.golang.org/protobuf v1.36.11 // indirect
8180
gopkg.in/inf.v0 v0.9.1 // indirect
8281
gopkg.in/yaml.v2 v2.4.0 // indirect
8382
gopkg.in/yaml.v3 v3.0.1 // indirect
84-
k8s.io/api v0.34.3 // indirect
85-
k8s.io/apimachinery v0.34.3 // indirect
86-
k8s.io/apiserver v0.34.3 // indirect
87-
k8s.io/component-base v0.34.3 // indirect
83+
k8s.io/api v0.35.1 // indirect
84+
k8s.io/apimachinery v0.35.1 // indirect
85+
k8s.io/apiserver v0.35.1 // indirect
86+
k8s.io/component-base v0.35.1 // indirect
8887
k8s.io/klog/v2 v2.130.1 // indirect
89-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
90-
k8s.io/kubernetes v1.34.3 // indirect
91-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
92-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
88+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
89+
k8s.io/kubernetes v1.35.1 // indirect
90+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
91+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
9392
sigs.k8s.io/randfill v1.0.0 // indirect
94-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
93+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
9594
sigs.k8s.io/yaml v1.6.0 // indirect
9695
)

0 commit comments

Comments
 (0)