Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade k8s dependencies 1.30 , golang 1.22, CSI Sidecar versions #84

Merged
merged 5 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: go

go:
- "1.19"

- "1.22.0"
- tip
group: bluezone
dist: trusty

matrix:
fast_finish: true
Expand All @@ -16,11 +15,6 @@ cache:

sudo: true

addons:
apt:
packages:
- docker-ce

before_install:
- sudo apt-get install bc

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.11
FROM golang:1.22.0

WORKDIR /go/src/github.com/IBM/ibm-vpc-file-csi-driver
ADD . /go/src/github.com/IBM/ibm-vpc-file-csi-driver
Expand Down
2 changes: 1 addition & 1 deletion OPENSOURCE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
docker://hub.docker.com/r/ubuntu,18.04
docker://hub.docker.com/r/golang,1.20.11
docker://hub.docker.com/r/golang,1.22.0
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ rules:
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["persistentvolumes"]
verbs: ["get", "list", "watch", "create", "delete"]
verbs: ["get", "list", "watch", "create", "patch", "delete"]
- apiGroups: [""]
resources: ["persistentvolumeclaims"]
verbs: ["get", "list", "watch", "update"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ spec:
spec:
containers:
- name: csi-provisioner
image: quay.io/k8scsi/csi-provisioner:v1.6.0
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v1.1.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: iks-vpc-file-driver
imagePullPolicy: Always
image: icr.io/ibm/ibm-vpc-file-csi-driver:v1.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ spec:
imagePullPolicy: Always
image: icr.io/ibm/ibm-vpc-file-csi-driver:v1.0.0
- name: csi-driver-registrar
image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v1.1.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ spec:
spec:
containers:
- name: csi-provisioner
image: icr.io/ext/k8scsi/csi-provisioner:v1.6.0
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: liveness-probe
image: icr.io/ext/k8scsi/livenessprobe:v1.1.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: iks-vpc-file-driver
imagePullPolicy: Always
image: (( concat "{{ DOCKER_REGISTRY }}/armada-master/ibm-vpc-file-csi-driver:" $RELEASE_TAG ))
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ spec:
imagePullPolicy: Always
image: (( concat "{{ DOCKER_REGISTRY }}/armada-master/ibm-vpc-file-csi-driver:" $RELEASE_TAG ))
- name: csi-driver-registrar
image: icr.io/ext/k8scsi/csi-node-driver-registrar:v1.2.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
- name: liveness-probe
image: icr.io/ext/k8scsi/livenessprobe:v1.1.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ spec:
spec:
containers:
- name: csi-provisioner
image: icr.io/ext/k8scsi/csi-provisioner:v1.6.0
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: csi-resizer
image: quay.io/k8scsi/csi-resizer:v1.0.0
- name: csi-attacher
image: icr.io/ext/k8scsi/csi-attacher:v2.2.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v1.1.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
- name: iks-vpc-file-driver
imagePullPolicy: Always
image: icr.io/ibm/ibm-vpc-file-csi-driver:v1.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ spec:
imagePullPolicy: Always
image: icr.io/ibm/ibm-vpc-file-csi-driver:v1.0.0
- name: csi-driver-registrar
image: icr.io/ext/k8scsi/csi-node-driver-registrar:v1.2.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
imagePullPolicy: IfNotPresent
- name: liveness-probe
image: quay.io/k8scsi/livenessprobe:v1.1.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
imagePullPolicy: IfNotPresent
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ spec:
spec:
containers:
- name: csi-provisioner
image: icr.io/ext/sig-storage/csi-provisioner:v3.6.3
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: liveness-probe
image: icr.io/ext/sig-storage/livenessprobe:v2.11.0
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
- name: iks-vpc-file-driver
imagePullPolicy: Always
image: icr.io/ibm/ibm-vpc-file-csi-driver:v1.2.4-beta
- name: storage-secret-sidecar
image: icr.io/obs/armada-storage-secret:v1.2.31
- name: csi-resizer
image: icr.io/ext/sig-storage/csi-resizer:v1.9.3
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ spec:
imagePullPolicy: Always
image: icr.io/ibm/ibm-vpc-file-csi-driver:v1.2.4-beta
- name: csi-driver-registrar
image: icr.io/ext/sig-storage/csi-node-driver-registrar:v2.9.3
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.3
- name: liveness-probe
image: icr.io/ext/sig-storage/livenessprobe:v2.11.0
- name: storage-secret-sidecar
image: icr.io/obs/armada-storage-secret:v1.2.31
image: registry.k8s.io/sig-storage/livenessprobe:v2.13.1
136 changes: 52 additions & 84 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
module github.com/IBM/ibm-vpc-file-csi-driver

go 1.20
go 1.22.0

require (
github.com/IBM/ibm-csi-common v1.1.13
github.com/IBM/ibmcloud-volume-file-vpc v1.2.4
github.com/IBM/ibmcloud-volume-interface v1.2.4
github.com/IBM/secret-utils-lib v1.1.9
github.com/container-storage-interface/spec v1.8.0
github.com/golang/glog v1.1.0
github.com/IBM/ibm-csi-common v1.1.15
github.com/IBM/ibmcloud-volume-file-vpc v1.2.5
github.com/IBM/ibmcloud-volume-interface v1.2.6
github.com/IBM/secret-utils-lib v1.1.11
github.com/container-storage-interface/spec v1.9.0
github.com/golang/glog v1.2.1
github.com/google/uuid v1.6.0
github.com/kubernetes-csi/csi-test/v4 v4.4.0
github.com/prometheus/client_golang v1.16.0
github.com/stretchr/testify v1.8.4
go.uber.org/zap v1.20.0
golang.org/x/net v0.24.0
golang.org/x/sys v0.19.0
google.golang.org/grpc v1.56.3
k8s.io/api v0.28.6
k8s.io/apimachinery v0.28.6
k8s.io/client-go v0.28.6
k8s.io/kubernetes v1.28.6
k8s.io/mount-utils v0.28.6
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
github.com/prometheus/client_golang v1.19.1
github.com/stretchr/testify v1.9.0
go.uber.org/zap v1.26.0
golang.org/x/net v0.26.0
golang.org/x/sys v0.21.0
google.golang.org/grpc v1.65.0
k8s.io/api v0.30.4
k8s.io/apimachinery v0.30.4
k8s.io/client-go v0.30.4
k8s.io/kubernetes v1.30.4
k8s.io/mount-utils v0.30.4
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
)

require (
github.com/BurntSushi/toml v1.0.0 // indirect
github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7 // indirect
github.com/IBM/go-sdk-core/v5 v5.15.1 // indirect
github.com/IBM/secret-common-lib v1.1.8 // indirect
github.com/IBM/go-sdk-core/v5 v5.17.4 // indirect
github.com/IBM/secret-common-lib v1.1.11 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/errors v0.21.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/strfmt v0.22.0 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/strfmt v0.22.1 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.17.0 // indirect
github.com/go-playground/validator/v10 v10.19.0 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
Expand All @@ -59,80 +59,48 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.5 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/leodido/go-urn v1.3.0 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.33.0 // indirect
github.com/onsi/gomega v1.33.1 // indirect
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.mongodb.org/mongo-driver v1.13.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.28.6 // indirect
k8s.io/apiserver v0.28.6 // indirect
k8s.io/component-base v0.28.6 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/apiextensions-apiserver v0.30.4 // indirect
k8s.io/apiserver v0.30.4 // indirect
k8s.io/component-base v0.30.4 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/onsi/gomega => github.com/onsi/gomega v1.27.6
k8s.io/api => k8s.io/api v0.28.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.6
k8s.io/apimachinery => k8s.io/apimachinery v0.28.6
k8s.io/apiserver => k8s.io/apiserver v0.28.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.6
k8s.io/client-go => k8s.io/client-go v0.28.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.6
k8s.io/code-generator => k8s.io/code-generator v0.28.6
k8s.io/component-base => k8s.io/component-base v0.28.6
k8s.io/component-helpers => k8s.io/component-helpers v0.28.6
k8s.io/controller-manager => k8s.io/controller-manager v0.28.6
k8s.io/cri-api => k8s.io/cri-api v0.28.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.6
k8s.io/kubectl => k8s.io/kubectl v0.28.6
k8s.io/kubelet => k8s.io/kubelet v0.28.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.6
k8s.io/metrics => k8s.io/metrics v0.28.6
k8s.io/mount-utils => k8s.io/mount-utils v0.28.6
k8s.io/node-api => k8s.io/node-api v0.28.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.6
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading