Skip to content

Commit 7183122

Browse files
jiaqiluojiaqiluo
authored
Merge pull request #488 from jiaqiluo/bump-rke-17
2 parents c4ee3b0 + 1904b61 commit 7183122

File tree

3 files changed

+1083
-218
lines changed

3 files changed

+1083
-218
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ Branching the Provider
125125

126126
The provider is branched to align with RKE versions:
127127

128-
- `master` is aligned with RKE v1.6
128+
- `master` is aligned with RKE v1.7
129+
- `release/v1.6` is aligned with RKE v1.6
129130
- `release/v1.5` is aligned with RKE v1.5
130131
- `release/v1.4` is aligned with RKE v1.4
131132
- `release/v1.3` is aligned with RKE v1.3

‎go.mod‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,50 @@ go 1.22.0
55
toolchain go1.22.3
66

77
replace (
8-
k8s.io/api => k8s.io/api v0.30.1
9-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.1
10-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.1
11-
k8s.io/apiserver => k8s.io/apiserver v0.30.1
12-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.1
13-
k8s.io/client-go => k8s.io/client-go v0.30.1
14-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.1
15-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.1
16-
k8s.io/code-generator => k8s.io/code-generator v0.30.1
17-
k8s.io/component-base => k8s.io/component-base v0.30.1
18-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.1
19-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.1
20-
k8s.io/cri-api => k8s.io/cri-api v0.30.1
21-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.1
22-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.1
23-
k8s.io/endpointslice => k8s.io/endpointslice v0.30.1
24-
k8s.io/kms => k8s.io/kms v0.30.1
25-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.1
26-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.1
27-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.1
28-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.1
29-
k8s.io/kubectl => k8s.io/kubectl v0.30.1
30-
k8s.io/kubelet => k8s.io/kubelet v0.30.1
31-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.1
32-
k8s.io/metrics => k8s.io/metrics v0.30.1
33-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.1
34-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.1
35-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.1
8+
k8s.io/api => k8s.io/api v0.31.1
9+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.1
10+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.1
11+
k8s.io/apiserver => k8s.io/apiserver v0.31.1
12+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.1
13+
k8s.io/client-go => k8s.io/client-go v0.31.1
14+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.1
15+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.1
16+
k8s.io/code-generator => k8s.io/code-generator v0.31.1
17+
k8s.io/component-base => k8s.io/component-base v0.31.1
18+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.1
19+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.1
20+
k8s.io/cri-api => k8s.io/cri-api v0.31.1
21+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.1
22+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.1
23+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.1
24+
k8s.io/kms => k8s.io/kms v0.31.1
25+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.1
26+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.1
27+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.1
28+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.1
29+
k8s.io/kubectl => k8s.io/kubectl v0.31.1
30+
k8s.io/kubelet => k8s.io/kubelet v0.31.1
31+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.1
32+
k8s.io/metrics => k8s.io/metrics v0.31.1
33+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.1
34+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.1
35+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.1
3636
)
3737

3838
require (
3939
github.com/blang/semver v3.5.1+incompatible
4040
github.com/ghodss/yaml v1.0.0
4141
github.com/hashicorp/go-version v1.6.0
4242
github.com/hashicorp/terraform-plugin-sdk/v2 v2.29.0
43-
github.com/rancher/rke v1.6.3
43+
github.com/rancher/rke v1.7.0
4444
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
4545
github.com/sirupsen/logrus v1.9.3
4646
gopkg.in/yaml.v2 v2.4.0
47-
k8s.io/api v0.30.1
48-
k8s.io/apimachinery v0.30.1
49-
k8s.io/apiserver v0.30.1
50-
k8s.io/client-go v0.30.1
51-
k8s.io/kubernetes v1.30.1
47+
k8s.io/api v0.31.1
48+
k8s.io/apimachinery v0.31.1
49+
k8s.io/apiserver v0.31.1
50+
k8s.io/client-go v0.31.1
51+
k8s.io/kubernetes v1.31.1
5252
)
5353

5454
require (
@@ -66,29 +66,29 @@ require (
6666
github.com/aws/aws-sdk-go v1.38.65 // indirect
6767
github.com/beorn7/perks v1.0.1 // indirect
6868
github.com/blang/semver/v4 v4.0.0 // indirect
69-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
69+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7070
github.com/chai2010/gettext-go v1.0.2 // indirect
7171
github.com/cloudflare/circl v1.3.3 // indirect
7272
github.com/containerd/cgroups v1.1.0 // indirect
7373
github.com/containerd/containerd v1.6.27 // indirect
7474
github.com/coreos/go-semver v0.3.1 // indirect
7575
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
76-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
77-
github.com/davecgh/go-spew v1.1.1 // indirect
76+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
77+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7878
github.com/docker/distribution v2.8.2+incompatible // indirect
7979
github.com/docker/docker v20.10.25+incompatible // indirect
8080
github.com/docker/go-connections v0.4.0 // indirect
8181
github.com/docker/go-units v0.5.0 // indirect
8282
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
83-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
8483
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
85-
github.com/fatih/color v1.13.0 // indirect
84+
github.com/fatih/color v1.15.0 // indirect
85+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8686
github.com/go-errors/errors v1.4.2 // indirect
8787
github.com/go-ini/ini v1.37.0 // indirect
88-
github.com/go-logr/logr v1.4.1 // indirect
88+
github.com/go-logr/logr v1.4.2 // indirect
8989
github.com/go-openapi/jsonpointer v0.19.6 // indirect
9090
github.com/go-openapi/jsonreference v0.20.2 // indirect
91-
github.com/go-openapi/swag v0.22.3 // indirect
91+
github.com/go-openapi/swag v0.22.4 // indirect
9292
github.com/gogo/protobuf v1.3.2 // indirect
9393
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9494
github.com/golang/protobuf v1.5.4 // indirect
@@ -97,7 +97,7 @@ require (
9797
github.com/google/go-cmp v0.6.0 // indirect
9898
github.com/google/gofuzz v1.2.0 // indirect
9999
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
100-
github.com/google/uuid v1.3.0 // indirect
100+
github.com/google/uuid v1.6.0 // indirect
101101
github.com/gorilla/websocket v1.5.1 // indirect
102102
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
103103
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -126,19 +126,18 @@ require (
126126
github.com/json-iterator/go v1.1.12 // indirect
127127
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
128128
github.com/mailru/easyjson v0.7.7 // indirect
129-
github.com/mattn/go-colorable v0.1.12 // indirect
130-
github.com/mattn/go-isatty v0.0.17 // indirect
131-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
129+
github.com/mattn/go-colorable v0.1.13 // indirect
130+
github.com/mattn/go-isatty v0.0.20 // indirect
132131
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa // indirect
133132
github.com/mitchellh/copystructure v1.2.0 // indirect
134133
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
135134
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
136135
github.com/mitchellh/mapstructure v1.5.0 // indirect
137136
github.com/mitchellh/reflectwalk v1.0.2 // indirect
138-
github.com/moby/spdystream v0.2.0 // indirect
137+
github.com/moby/spdystream v0.4.0 // indirect
139138
github.com/moby/sys/mount v0.2.0 // indirect
140-
github.com/moby/sys/mountinfo v0.6.2 // indirect
141-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
139+
github.com/moby/sys/mountinfo v0.7.1 // indirect
140+
github.com/moby/term v0.5.0 // indirect
142141
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
143142
github.com/modern-go/reflect2 v1.0.2 // indirect
144143
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -150,60 +149,61 @@ require (
150149
github.com/opencontainers/runc v1.1.14 // indirect
151150
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
152151
github.com/pkg/errors v0.9.1 // indirect
153-
github.com/prometheus/client_golang v1.16.0 // indirect
154-
github.com/prometheus/client_model v0.4.0 // indirect
155-
github.com/prometheus/common v0.44.0 // indirect
156-
github.com/prometheus/procfs v0.10.1 // indirect
157-
github.com/rancher/lasso v0.0.0-20240430201833-6f3def65ffc5 // indirect
158-
github.com/rancher/norman v0.0.0-20240604183301-20cd23aadce1 // indirect
159-
github.com/rancher/wrangler/v3 v3.0.0-rc2 // indirect
152+
github.com/prometheus/client_golang v1.19.1 // indirect
153+
github.com/prometheus/client_model v0.6.1 // indirect
154+
github.com/prometheus/common v0.55.0 // indirect
155+
github.com/prometheus/procfs v0.15.1 // indirect
156+
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 // indirect
157+
github.com/rancher/norman v0.0.0-20241001183610-78a520c160ab // indirect
158+
github.com/rancher/wrangler/v3 v3.0.1-rc.2 // indirect
160159
github.com/russross/blackfriday/v2 v2.1.0 // indirect
161160
github.com/shopspring/decimal v1.2.0 // indirect
162161
github.com/spf13/cast v1.3.1 // indirect
163-
github.com/spf13/cobra v1.7.0 // indirect
162+
github.com/spf13/cobra v1.8.1 // indirect
164163
github.com/spf13/pflag v1.0.5 // indirect
165164
github.com/urfave/cli v1.22.2 // indirect
166165
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
167166
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
168167
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
168+
github.com/x448/float16 v0.8.4 // indirect
169169
github.com/xlab/treeprint v1.2.0 // indirect
170170
github.com/zclconf/go-cty v1.14.0 // indirect
171-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
172-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
173-
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
174-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
171+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
172+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
173+
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
174+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
175175
go.opencensus.io v0.24.0 // indirect
176176
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
177177
go.uber.org/multierr v1.11.0 // indirect
178178
go.uber.org/zap v1.26.0 // indirect
179-
golang.org/x/crypto v0.22.0 // indirect
180-
golang.org/x/mod v0.17.0 // indirect
181-
golang.org/x/net v0.24.0 // indirect
182-
golang.org/x/oauth2 v0.16.0 // indirect
183-
golang.org/x/sync v0.7.0 // indirect
184-
golang.org/x/sys v0.19.0 // indirect
185-
golang.org/x/term v0.19.0 // indirect
186-
golang.org/x/text v0.14.0 // indirect
187-
golang.org/x/time v0.3.0 // indirect
188-
golang.org/x/tools v0.20.0 // indirect
189-
google.golang.org/appengine v1.6.7 // indirect
190-
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
191-
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
192-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
193-
google.golang.org/grpc v1.58.3 // indirect
194-
google.golang.org/protobuf v1.33.0 // indirect
179+
golang.org/x/crypto v0.26.0 // indirect
180+
golang.org/x/mod v0.20.0 // indirect
181+
golang.org/x/net v0.28.0 // indirect
182+
golang.org/x/oauth2 v0.21.0 // indirect
183+
golang.org/x/sync v0.8.0 // indirect
184+
golang.org/x/sys v0.23.0 // indirect
185+
golang.org/x/term v0.23.0 // indirect
186+
golang.org/x/text v0.17.0 // indirect
187+
golang.org/x/time v0.5.0 // indirect
188+
golang.org/x/tools v0.24.0 // indirect
189+
google.golang.org/appengine v1.6.8 // indirect
190+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
191+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
192+
google.golang.org/grpc v1.65.0 // indirect
193+
google.golang.org/protobuf v1.34.2 // indirect
194+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
195195
gopkg.in/inf.v0 v0.9.1 // indirect
196196
gopkg.in/yaml.v3 v3.0.1 // indirect
197-
k8s.io/cli-runtime v0.30.1 // indirect
198-
k8s.io/component-base v0.30.1 // indirect
199-
k8s.io/klog/v2 v2.120.1 // indirect
197+
k8s.io/cli-runtime v0.31.1 // indirect
198+
k8s.io/component-base v0.31.1 // indirect
199+
k8s.io/klog/v2 v2.130.1 // indirect
200200
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
201-
k8s.io/kubectl v0.30.1 // indirect
202-
k8s.io/pod-security-admission v0.30.1 // indirect
203-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
201+
k8s.io/kubectl v0.31.1 // indirect
202+
k8s.io/pod-security-admission v0.31.1 // indirect
203+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
204204
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
205-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
206-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
205+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
206+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
207207
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
208-
sigs.k8s.io/yaml v1.3.0 // indirect
208+
sigs.k8s.io/yaml v1.4.0 // indirect
209209
)

0 commit comments

Comments
 (0)