Skip to content

Commit 59170d9

Browse files
GunaKKIBMGunaKKIBM
authored
K8S upgrade to 28.6 (#104)
* K8S upgrade to 28.6 * Updated for go mod * Updated for go mod * checking replace * Updated for go mod * Updated for go mod
1 parent 40967f1 commit 59170d9

File tree

4 files changed

+345
-359
lines changed

4 files changed

+345
-359
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: go
22

33
go:
4-
- 1.18.6
4+
- 1.20.11
55
- tip
66

77
group: bluezone

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARCH=$(shell docker version -f {{.Client.Arch}})
1010
GO111MODULE_FLAG?=on
1111
export GO111MODULE=$(GO111MODULE_FLAG)
1212

13-
export LINT_VERSION="1.27.0"
13+
export LINT_VERSION="1.51.2"
1414

1515
COLOR_YELLOW=\033[0;33m
1616
COLOR_RESET=\033[0m

‎go.mod

Lines changed: 88 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,112 @@
11
module github.com/IBM/ibm-csi-common
22

3-
go 1.18
3+
go 1.20
44

55
require (
6-
github.com/IBM/ibmcloud-volume-interface v1.1.4
7-
github.com/IBM/ibmcloud-volume-vpc v1.1.5
8-
github.com/IBM/secret-utils-lib v1.1.4
9-
github.com/container-storage-interface/spec v1.7.0
10-
github.com/gofrs/uuid v4.2.0+incompatible
11-
github.com/golang/glog v1.0.0
6+
github.com/IBM/ibmcloud-volume-interface v1.2.2
7+
github.com/IBM/ibmcloud-volume-vpc v1.1.7
8+
github.com/IBM/secret-utils-lib v1.1.8
9+
github.com/container-storage-interface/spec v1.8.0
10+
github.com/gofrs/uuid v4.4.0+incompatible
11+
github.com/golang/glog v1.1.0
1212
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0
13-
github.com/onsi/ginkgo/v2 v2.4.0
14-
github.com/onsi/gomega v1.23.0
15-
github.com/prometheus/client_golang v1.14.0
16-
github.com/stretchr/testify v1.8.0
13+
github.com/onsi/ginkgo/v2 v2.9.4
14+
github.com/onsi/gomega v1.27.6
15+
github.com/prometheus/client_golang v1.16.0
16+
github.com/stretchr/testify v1.8.2
1717
go.uber.org/zap v1.20.0
18-
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10
19-
google.golang.org/grpc v1.49.0
20-
google.golang.org/protobuf v1.28.1
21-
k8s.io/api v0.26.1
22-
k8s.io/apimachinery v0.26.1
23-
k8s.io/client-go v0.26.1
24-
k8s.io/kubernetes v1.26.1
25-
k8s.io/mount-utils v0.26.1
26-
k8s.io/pod-security-admission v0.0.0
27-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
18+
golang.org/x/net v0.19.0
19+
google.golang.org/grpc v1.56.3
20+
google.golang.org/protobuf v1.31.0
21+
k8s.io/api v0.28.6
22+
k8s.io/apimachinery v0.28.6
23+
k8s.io/client-go v0.28.6
24+
k8s.io/kubernetes v1.28.6
25+
k8s.io/mount-utils v0.28.6
26+
k8s.io/pod-security-admission v0.28.6
27+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
2828
)
2929

3030
require (
3131
github.com/BurntSushi/toml v1.0.0 // indirect
3232
github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7 // indirect
3333
github.com/IBM/go-sdk-core/v5 v5.9.1 // indirect
34-
github.com/IBM/secret-common-lib v1.1.4 // indirect
34+
github.com/IBM/secret-common-lib v1.1.8 // indirect
35+
github.com/NYTimes/gziphandler v1.1.1 // indirect
36+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
3537
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
36-
github.com/aws/aws-sdk-go v1.44.116 // indirect
3738
github.com/beorn7/perks v1.0.1 // indirect
3839
github.com/blang/semver/v4 v4.0.0 // indirect
39-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
40-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
40+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
41+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
42+
github.com/coreos/go-semver v0.3.1 // indirect
43+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4144
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/docker/distribution v2.8.1+incompatible // indirect
43-
github.com/elazarl/goproxy v0.0.0-20191011121108-aa519ddbe484 // indirect
45+
github.com/docker/distribution v2.8.2+incompatible // indirect
4446
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
45-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
47+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4648
github.com/fatih/structs v1.1.0 // indirect
4749
github.com/felixge/httpsnoop v1.0.3 // indirect
48-
github.com/go-logr/logr v1.2.3 // indirect
50+
github.com/fsnotify/fsnotify v1.6.0 // indirect
51+
github.com/go-logr/logr v1.2.4 // indirect
4952
github.com/go-logr/stdr v1.2.2 // indirect
5053
github.com/go-openapi/errors v0.19.8 // indirect
51-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
52-
github.com/go-openapi/jsonreference v0.20.0 // indirect
54+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
55+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5356
github.com/go-openapi/strfmt v0.21.1 // indirect
54-
github.com/go-openapi/swag v0.19.14 // indirect
57+
github.com/go-openapi/swag v0.22.3 // indirect
5558
github.com/go-playground/locales v0.14.0 // indirect
5659
github.com/go-playground/universal-translator v0.18.0 // indirect
5760
github.com/go-playground/validator/v10 v10.11.1 // indirect
5861
github.com/go-stack/stack v1.8.0 // indirect
62+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5963
github.com/gogo/protobuf v1.3.2 // indirect
6064
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
61-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
65+
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
6266
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
63-
github.com/golang/protobuf v1.5.2 // indirect
64-
github.com/google/gnostic v0.5.7-v3refs // indirect
67+
github.com/golang/protobuf v1.5.3 // indirect
68+
github.com/google/cel-go v0.16.1 // indirect
69+
github.com/google/gnostic-models v0.6.8 // indirect
6570
github.com/google/go-cmp v0.5.9 // indirect
66-
github.com/google/gofuzz v1.1.0 // indirect
67-
github.com/google/uuid v1.1.2 // indirect
71+
github.com/google/gofuzz v1.2.0 // indirect
72+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
73+
github.com/google/uuid v1.3.0 // indirect
74+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6875
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
6976
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
7077
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
7178
github.com/imdario/mergo v0.3.7 // indirect
72-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
73-
github.com/jmespath/go-jmespath v0.4.0 // indirect
79+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7480
github.com/josharian/intern v1.0.0 // indirect
7581
github.com/json-iterator/go v1.1.12 // indirect
7682
github.com/kelseyhightower/envconfig v1.4.0 // indirect
7783
github.com/leodido/go-urn v1.2.1 // indirect
78-
github.com/mailru/easyjson v0.7.6 // indirect
79-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
84+
github.com/mailru/easyjson v0.7.7 // indirect
85+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8086
github.com/mitchellh/mapstructure v1.4.1 // indirect
8187
github.com/moby/spdystream v0.2.0 // indirect
8288
github.com/moby/sys/mountinfo v0.6.2 // indirect
8389
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8490
github.com/modern-go/reflect2 v1.0.2 // indirect
8591
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
92+
github.com/nxadm/tail v1.4.11 // indirect
8693
github.com/oklog/ulid v1.3.1 // indirect
8794
github.com/opencontainers/go-digest v1.0.0 // indirect
8895
github.com/opencontainers/selinux v1.10.0 // indirect
89-
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0 // indirect
9096
github.com/pkg/errors v0.9.1 // indirect
9197
github.com/pmezard/go-difflib v1.0.0 // indirect
92-
github.com/prometheus/client_model v0.3.0 // indirect
93-
github.com/prometheus/common v0.37.0 // indirect
94-
github.com/prometheus/procfs v0.8.0 // indirect
95-
github.com/spf13/cobra v1.6.0 // indirect
98+
github.com/prometheus/client_model v0.4.0 // indirect
99+
github.com/prometheus/common v0.44.0 // indirect
100+
github.com/prometheus/procfs v0.10.1 // indirect
101+
github.com/spf13/cobra v1.7.0 // indirect
96102
github.com/spf13/pflag v1.0.5 // indirect
103+
github.com/stoewer/go-strcase v1.2.0 // indirect
104+
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
105+
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
106+
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
97107
go.mongodb.org/mongo-driver v1.7.5 // indirect
98-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
108+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
109+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
99110
go.opentelemetry.io/otel v1.10.0 // indirect
100111
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
101112
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
@@ -104,61 +115,42 @@ require (
104115
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
105116
go.opentelemetry.io/otel/trace v1.10.0 // indirect
106117
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
107-
go.uber.org/atomic v1.7.0 // indirect
108-
go.uber.org/multierr v1.6.0 // indirect
109-
golang.org/x/crypto v0.1.0 // indirect
110-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
111-
golang.org/x/sys v0.3.0 // indirect
112-
golang.org/x/term v0.3.0 // indirect
113-
golang.org/x/text v0.5.0 // indirect
114-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
118+
go.uber.org/atomic v1.11.0 // indirect
119+
go.uber.org/multierr v1.11.0 // indirect
120+
golang.org/x/crypto v0.16.0 // indirect
121+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
122+
golang.org/x/oauth2 v0.8.0 // indirect
123+
golang.org/x/sync v0.5.0 // indirect
124+
golang.org/x/sys v0.15.0 // indirect
125+
golang.org/x/term v0.15.0 // indirect
126+
golang.org/x/text v0.14.0 // indirect
127+
golang.org/x/time v0.3.0 // indirect
128+
golang.org/x/tools v0.16.1 // indirect
115129
google.golang.org/appengine v1.6.7 // indirect
116-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
130+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
131+
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
117133
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
118134
gopkg.in/inf.v0 v0.9.1 // indirect
135+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
119136
gopkg.in/yaml.v2 v2.4.0 // indirect
120137
gopkg.in/yaml.v3 v3.0.1 // indirect
121-
k8s.io/apiextensions-apiserver v0.0.0 // indirect
122-
k8s.io/apiserver v0.26.1 // indirect
123-
k8s.io/cloud-provider v0.0.0 // indirect
124-
k8s.io/component-base v0.26.1 // indirect
125-
k8s.io/component-helpers v0.26.1 // indirect
126-
k8s.io/klog/v2 v2.80.1 // indirect
127-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
128-
k8s.io/kubectl v0.0.0 // indirect
129-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
130-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
138+
k8s.io/apiextensions-apiserver v0.28.6 // indirect
139+
k8s.io/apiserver v0.28.6 // indirect
140+
k8s.io/cloud-provider v0.28.6 // indirect
141+
k8s.io/component-base v0.28.6 // indirect
142+
k8s.io/component-helpers v0.28.6 // indirect
143+
k8s.io/controller-manager v0.28.6 // indirect
144+
k8s.io/csi-translation-lib v0.28.6 // indirect
145+
k8s.io/klog/v2 v2.100.1 // indirect
146+
k8s.io/kms v0.28.6 // indirect
147+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
148+
k8s.io/kubectl v0.28.6 // indirect
149+
k8s.io/kubelet v0.28.6 // indirect
150+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
151+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
131152
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
132153
sigs.k8s.io/yaml v1.3.0 // indirect
133154
)
134155

135-
replace (
136-
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.1.0
137-
k8s.io/api => k8s.io/api v0.26.1
138-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.1
139-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.1
140-
k8s.io/apiserver => k8s.io/apiserver v0.26.1
141-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.1
142-
k8s.io/client-go => k8s.io/client-go v0.26.1
143-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.1
144-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.1
145-
k8s.io/code-generator => k8s.io/code-generator v0.26.1
146-
k8s.io/component-base => k8s.io/component-base v0.26.1
147-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.1
148-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.1
149-
k8s.io/cri-api => k8s.io/cri-api v0.26.1
150-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.1
151-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.1
152-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.1
153-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.1
154-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.1
155-
k8s.io/kubectl => k8s.io/kubectl v0.26.1
156-
k8s.io/kubelet => k8s.io/kubelet v0.26.1
157-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.1
158-
k8s.io/metrics => k8s.io/metrics v0.26.1
159-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.1
160-
k8s.io/node-api => k8s.io/node-api v0.26.1
161-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.1
162-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.1
163-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.1
164-
)
156+
replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.1.0

0 commit comments

Comments
 (0)