Skip to content

Commit ca6959e

Browse files
guangyeeguangyee
authored
Merge pull request #79 from guangyee/k8s_update
Bump to 1.28 k8s version
2 parents 065a9f4 + e4ce504 commit ca6959e

File tree

5 files changed

+1079
-141
lines changed

5 files changed

+1079
-141
lines changed

‎charts/rancher-csp-adapter/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ annotations:
1313
catalog.cattle.io/os: linux
1414
catalog.cattle.io/permits-os: linux
1515
catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
16-
catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.28.0-0'
16+
catalog.cattle.io/kube-version: '>= 1.23.0-0 < 1.29.0-0'

‎go.mod

+47-46
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@ go 1.20
55
replace (
66
github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20220519154712-0e2fdc8060bc
77
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20220519154712-0e2fdc8060bc
8-
k8s.io/api => k8s.io/api v0.27.4
9-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.4
10-
k8s.io/apimachinery => k8s.io/apimachinery v0.27.4
11-
k8s.io/apiserver => k8s.io/apiserver v0.27.4
12-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.4
13-
k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1
14-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.4
15-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.4
16-
k8s.io/code-generator => k8s.io/code-generator v0.27.4
17-
k8s.io/component-base => k8s.io/component-base v0.27.4
18-
k8s.io/cri-api => k8s.io/cri-api v0.27.4
19-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.4
20-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.4
21-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.4
22-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.4
23-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.4
24-
k8s.io/kubectl => k8s.io/kubectl v0.27.4
25-
k8s.io/kubelet => k8s.io/kubelet v0.27.4
26-
k8s.io/kubernetes => k8s.io/kubernetes v1.27.4
27-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.4
28-
k8s.io/metrics => k8s.io/metrics v0.27.4
29-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.4
8+
k8s.io/api => k8s.io/api v0.28.6
9+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.6
10+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.6
11+
k8s.io/apiserver => k8s.io/apiserver v0.28.6
12+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.6
13+
k8s.io/client-go => github.com/rancher/client-go v1.28.6-rancher1
14+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.6
15+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.6
16+
k8s.io/code-generator => k8s.io/code-generator v0.28.6
17+
k8s.io/component-base => k8s.io/component-base v0.28.6
18+
k8s.io/cri-api => k8s.io/cri-api v0.28.6
19+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.6
20+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.6
21+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.6
22+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.6
23+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.6
24+
k8s.io/kubectl => k8s.io/kubectl v0.28.6
25+
k8s.io/kubelet => k8s.io/kubelet v0.28.6
26+
k8s.io/kubernetes => k8s.io/kubernetes v1.28.6
27+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.6
28+
k8s.io/metrics => k8s.io/metrics v0.28.6
29+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.6
3030
)
3131

3232
require (
@@ -35,14 +35,14 @@ require (
3535
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0
3636
github.com/google/uuid v1.3.0
3737
github.com/prometheus/client_model v0.4.0
38-
github.com/prometheus/common v0.43.0
39-
github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29
38+
github.com/prometheus/common v0.44.0
39+
github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa
4040
github.com/rancher/rancher/pkg/apis v0.0.0
41-
github.com/rancher/wrangler v0.8.11
41+
github.com/rancher/wrangler/v2 v2.1.3
4242
github.com/sirupsen/logrus v1.9.0
4343
github.com/stretchr/testify v1.8.4
44-
k8s.io/api v0.27.4
45-
k8s.io/apimachinery v0.27.4
44+
k8s.io/api v0.28.6
45+
k8s.io/apimachinery v0.28.6
4646
k8s.io/client-go v12.0.0+incompatible
4747
)
4848

@@ -62,15 +62,15 @@ require (
6262
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6363
github.com/davecgh/go-spew v1.1.1 // indirect
6464
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
65-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
65+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6666
github.com/ghodss/yaml v1.0.0 // indirect
67-
github.com/go-logr/logr v1.2.3 // indirect
67+
github.com/go-logr/logr v1.2.4 // indirect
6868
github.com/go-openapi/jsonpointer v0.19.6 // indirect
69-
github.com/go-openapi/jsonreference v0.20.1 // indirect
69+
github.com/go-openapi/jsonreference v0.20.2 // indirect
7070
github.com/go-openapi/swag v0.22.3 // indirect
7171
github.com/gogo/protobuf v1.3.2 // indirect
7272
github.com/golang/protobuf v1.5.3 // indirect
73-
github.com/google/gnostic v0.5.7-v3refs // indirect
73+
github.com/google/gnostic-models v0.6.8 // indirect
7474
github.com/google/go-cmp v0.5.9 // indirect
7575
github.com/google/gofuzz v1.2.0 // indirect
7676
github.com/imdario/mergo v0.3.12 // indirect
@@ -83,36 +83,37 @@ require (
8383
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8484
github.com/pkg/errors v0.9.1 // indirect
8585
github.com/pmezard/go-difflib v1.0.0 // indirect
86-
github.com/prometheus/client_golang v1.15.1 // indirect
87-
github.com/prometheus/procfs v0.9.0 // indirect
86+
github.com/prometheus/client_golang v1.16.0 // indirect
87+
github.com/prometheus/procfs v0.10.1 // indirect
8888
github.com/rancher/aks-operator v1.0.5 // indirect
8989
github.com/rancher/eks-operator v1.1.3 // indirect
9090
github.com/rancher/fleet/pkg/apis v0.0.0-20210918015053-5a141a6b18f0 // indirect
9191
github.com/rancher/gke-operator v1.1.3 // indirect
9292
github.com/rancher/norman v0.0.0-20220406153559-82478fb169cb // indirect
9393
github.com/rancher/rke v1.3.11 // indirect
94+
github.com/rancher/wrangler v0.8.11-0.20220411195911-c2b951ab3480 // indirect
9495
github.com/spf13/pflag v1.0.5 // indirect
95-
golang.org/x/net v0.12.0 // indirect
96+
golang.org/x/net v0.19.0 // indirect
9697
golang.org/x/oauth2 v0.10.0 // indirect
97-
golang.org/x/sync v0.1.0 // indirect
98-
golang.org/x/sys v0.10.0 // indirect
99-
golang.org/x/term v0.10.0 // indirect
100-
golang.org/x/text v0.11.0 // indirect
98+
golang.org/x/sync v0.5.0 // indirect
99+
golang.org/x/sys v0.15.0 // indirect
100+
golang.org/x/term v0.15.0 // indirect
101+
golang.org/x/text v0.14.0 // indirect
101102
golang.org/x/time v0.3.0 // indirect
102103
google.golang.org/appengine v1.6.7 // indirect
103104
google.golang.org/protobuf v1.31.0 // indirect
104105
gopkg.in/inf.v0 v0.9.1 // indirect
105106
gopkg.in/yaml.v2 v2.4.0 // indirect
106107
gopkg.in/yaml.v3 v3.0.1 // indirect
107-
k8s.io/apiextensions-apiserver v0.23.1 // indirect
108-
k8s.io/apiserver v0.27.4 // indirect
109-
k8s.io/component-base v0.27.4 // indirect
108+
k8s.io/apiextensions-apiserver v0.28.6 // indirect
109+
k8s.io/apiserver v0.28.6 // indirect
110+
k8s.io/component-base v0.28.6 // indirect
110111
k8s.io/klog v1.0.0 // indirect
111-
k8s.io/klog/v2 v2.90.1 // indirect
112-
k8s.io/kube-aggregator v0.21.0 // indirect
113-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
114-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
115-
sigs.k8s.io/cli-utils v0.16.0 // indirect
112+
k8s.io/klog/v2 v2.100.1 // indirect
113+
k8s.io/kube-aggregator v0.28.6 // indirect
114+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
115+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
116+
sigs.k8s.io/cli-utils v0.28.0 // indirect
116117
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
117118
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
118119
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)