Skip to content

Commit

Permalink
Upgrade k8s and other dependencies from 1.28 to 1.30
Browse files Browse the repository at this point in the history
Signed-off-by: Sameer Shaikh <[email protected]>
  • Loading branch information
sameshai committed Aug 29, 2024
1 parent 8663459 commit 37b6c21
Show file tree
Hide file tree
Showing 1,314 changed files with 103,455 additions and 60,353 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.19.6'
go-version: '1.22.0'
- name: Check out code
uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
- GO111MODULE=on

go:
- "1.20.10"
- "1.22.0"

before_install:
- go install github.com/mattn/goveralls@latest
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.10
FROM golang:1.22.0

WORKDIR /go/src/github.com/kubernetes-sigs/ibm-vpc-block-csi-driver
ADD . /go/src/github.com/kubernetes-sigs/ibm-vpc-block-csi-driver
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GIT_COMMIT_SHA="$(shell git rev-parse HEAD 2>/dev/null)"
GIT_REMOTE_URL="$(shell git config --get remote.origin.url 2>/dev/null)"
BUILD_DATE="$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")"
OSS_FILES := go.mod Dockerfile
GOLANG_VERSION="1.20.10"
GOLANG_VERSION="1.22.0"


STAGING_REGISTRY ?= gcr.io/k8s-staging-cloud-provider-ibm
Expand All @@ -44,7 +44,7 @@ BUILD_NUMBER?=unknown
GO111MODULE_FLAG?=on
export GO111MODULE=$(GO111MODULE_FLAG)

export LINT_VERSION="1.51.2"
export LINT_VERSION="1.60.1"

GOFILES=$(shell find . -type f -name '*.go' -not -path "./vendor/*")

Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (
k8sUtils "github.com/IBM/secret-utils-lib/pkg/k8s_utils"
"github.com/prometheus/client_golang/prometheus/promhttp"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
nodeInfoManager "github.com/IBM/ibm-csi-common/pkg/metadata"
"github.com/IBM/ibm-csi-common/pkg/metrics"
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
"github.com/IBM/ibm-csi-common/pkg/utils"
"github.com/IBM/ibm-csi-common/pkg/watcher"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
csiConfig "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/config"
driver "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/pkg/ibmcsidriver"
"go.uber.org/zap"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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,15 +7,15 @@ spec:
spec:
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: csi-attacher
image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
- name: iks-vpc-block-driver
imagePullPolicy: Always
image: registry.k8s.io/cloud-provider-ibm/ibm-vpc-block-csi-driver:v0.0.0
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ spec:
imagePullPolicy: Always
image: registry.k8s.io/cloud-provider-ibm/ibm-vpc-block-csi-driver:v0.0.0
- name: csi-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ spec:
spec:
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: csi-attacher
image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
- name: iks-vpc-block-driver
imagePullPolicy: Always
image: registry.k8s.io/cloud-provider-ibm/ibm-vpc-block-csi-driver:v0.0.0
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ spec:
imagePullPolicy: Always
image: registry.k8s.io/cloud-provider-ibm/ibm-vpc-block-csi-driver:v0.0.0
- name: csi-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.2.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ spec:
spec:
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: csi-attacher
image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
- name: iks-vpc-block-driver
imagePullPolicy: Always
image: registry.k8s.io/cloud-provider-ibm/ibm-vpc-block-csi-driver:v0.0.0
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ spec:
imagePullPolicy: Always
image: registry.k8s.io/cloud-provider-ibm/ibm-vpc-block-csi-driver:v0.0.0
- name: csi-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.2.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ spec:
spec:
containers:
- name: csi-provisioner
image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1
image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.2
- name: csi-attacher
image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.6.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
- name: iks-vpc-block-driver
imagePullPolicy: Always
image: gcr.io/k8s-staging-cloud-provider-ibm/ibm-vpc-block-csi-driver:master
- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.5.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.11.2
- name: csi-snapshotter
image: registry.k8s.io/sig-storage/csi-snapshotter:v6.0.1
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ spec:
imagePullPolicy: Always
image: gcr.io/k8s-staging-cloud-provider-ibm/ibm-vpc-block-csi-driver:master
- name: csi-driver-registrar
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.2.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.1
- name: liveness-probe
image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0
image: registry.k8s.io/sig-storage/csi-attacher:v2.13.1
157 changes: 60 additions & 97 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,142 +1,105 @@
module github.com/kubernetes-sigs/ibm-vpc-block-csi-driver

go 1.20
go 1.22.0

require (
github.com/IBM/ibm-csi-common v1.1.11
github.com/IBM/ibmcloud-volume-interface v1.2.2
github.com/IBM/ibmcloud-volume-vpc v1.1.7
github.com/IBM/secret-utils-lib v1.1.8
github.com/container-storage-interface/spec v1.8.0
github.com/golang/glog v1.1.0
github.com/google/uuid v1.3.0
github.com/IBM/ibm-csi-common v1.1.15
github.com/IBM/ibmcloud-volume-interface v1.2.6
github.com/IBM/ibmcloud-volume-vpc v1.1.11
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.3.0
github.com/prometheus/client_golang v1.16.0
github.com/stretchr/testify v1.8.2
go.uber.org/zap v1.20.0
golang.org/x/net v0.19.0
golang.org/x/sys v0.15.0
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.33.0
k8s.io/klog/v2 v2.100.1
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
google.golang.org/protobuf v1.34.2
k8s.io/klog/v2 v2.130.1
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.9.1 // indirect
github.com/IBM/secret-common-lib v1.1.8 // indirect
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // 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.9.0 // 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/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/errors v0.19.8 // 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.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.21.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.1 // indirect
github.com/go-stack/stack v1.8.0 // 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.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
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
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.0 // 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.2.1 // 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.4.1 // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // 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.14.2 // indirect
github.com/onsi/gomega v1.27.6 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.33.1 // 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.7.5 // 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.16.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/term v0.15.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
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // 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/api v0.28.6 // indirect
k8s.io/apiextensions-apiserver v0.28.6 // indirect
k8s.io/apimachinery v0.28.6 // indirect
k8s.io/apiserver v0.28.6 // indirect
k8s.io/client-go v11.0.1-0.20190516230509-ae8359b20417+incompatible // indirect
k8s.io/component-base v0.28.6 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/api v0.30.4 // indirect
k8s.io/apiextensions-apiserver v0.30.4 // indirect
k8s.io/apimachinery v0.30.4 // indirect
k8s.io/apiserver v0.30.4 // indirect
k8s.io/client-go v0.30.4 // indirect
k8s.io/component-base v0.30.4 // 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/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.1.0
golang.org/x/net => golang.org/x/net v0.19.0
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/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation 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/pod-security-admission => k8s.io/pod-security-admission 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

0 comments on commit 37b6c21

Please sign in to comment.