STOR-1404: Rebase external-provisioner to v3.6.0 for OCP 4.15

README.md

@@ -11,7 +11,7 @@ This information reflects the head of this branch.
 
 | Compatible with CSI Version | Container Image | [Min K8s Version](https://kubernetes-csi.github.io/docs/kubernetes-compatibility.html#minimum-version) | [Recommended K8s Version](https://kubernetes-csi.github.io/docs/kubernetes-compatibility.html#recommended-version) |
 | ------------------------------------------------------------------------------------------ | -------------------------------| --------------- | ------------- |
-| [CSI Spec v1.7.0](https://github.com/container-storage-interface/spec/releases/tag/v1.7.0) | k8s.gcr.io/sig-storage/csi-provisioner | 1.20 | 1.26 |
+| [CSI Spec v1.7.0](https://github.com/container-storage-interface/spec/releases/tag/v1.7.0) | registry.k8s.io/sig-storage/csi-provisioner | 1.20 | 1.27 |
 
 ## Feature status
 
@@ -24,10 +24,10 @@ Following table reflects the head of this branch.
 | Snapshots      | GA      | On      | [Snapshots and Restore](https://kubernetes-csi.github.io/docs/snapshot-restore-feature.html).                                                                        | No |
 | CSIMigration   | GA    | On      | [Migrating in-tree volume plugins to CSI](https://kubernetes.io/docs/concepts/storage/volumes/#csi-migration).                                                       | No |
 | CSIStorageCapacity | GA  | On  | Publish [capacity information](https://kubernetes.io/docs/concepts/storage/volumes/#storage-capacity) for the Kubernetes scheduler.                                  | No |
-| ReadWriteOncePod   | Alpha | Off | [Single pod access mode for PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes).                                        | No |
+| ReadWriteOncePod   | Beta | On | [Single pod access mode for PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes).                                        | No |
+| CSINodeExpandSecret | Beta | On | [CSI Node expansion secret](https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/3107-csi-nodeexpandsecret)                                  | No |
 | HonorPVReclaimPolicy| Alpha |Off | [Honor the PV reclaim policy](https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/2644-honor-pv-reclaim-policy)                                  | No |
 | PreventVolumeModeConversion | Alpha |Off | [Prevent unauthorized conversion of source volume mode](https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/3141-prevent-volume-mode-conversion) | `--prevent-volume-mode-conversion` (No in-tree feature gate) |
-| CSINodeExpandSecret | Alpha |Off | [CSI Node expansion secret](https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/3107-csi-nodeexpandsecret)                                  | No |
 | CrossNamespaceVolumeDataSource | Alpha |Off | [Cross-namespace volume data source](https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/3294-provision-volumes-from-cross-namespace-snapshots) | `--feature-gates=CrossNamespaceVolumeDataSource=true` |
 
 All other external-provisioner features and the external-provisioner itself is considered GA and fully supported.

go.mod

@@ -6,186 +6,192 @@ require (
 	github.com/container-storage-interface/spec v1.8.0
 	github.com/golang/mock v1.6.0
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/kubernetes-csi/csi-lib-utils v0.13.0
+	github.com/kubernetes-csi/csi-lib-utils v0.14.0
 	github.com/kubernetes-csi/csi-test/v5 v5.0.0
 	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.2.0
-	github.com/miekg/dns v1.1.48 // indirect
-	github.com/prometheus/client_golang v1.15.0
+	github.com/miekg/dns v1.1.55 // indirect
+	github.com/prometheus/client_golang v1.16.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.2
-	google.golang.org/grpc v1.54.0
-	google.golang.org/protobuf v1.30.0
-	k8s.io/api v0.27.0
-	k8s.io/apimachinery v0.27.0
-	k8s.io/apiserver v0.27.0
-	k8s.io/client-go v0.27.0
-	k8s.io/component-base v0.27.0
-	k8s.io/component-helpers v0.27.0
-	k8s.io/csi-translation-lib v0.27.0
-	k8s.io/klog/v2 v2.90.1
-	sigs.k8s.io/controller-runtime v0.14.6
-	sigs.k8s.io/gateway-api v0.6.2
-	sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.0.2
+	github.com/stretchr/testify v1.8.4
+	google.golang.org/grpc v1.57.0
+	google.golang.org/protobuf v1.31.0
+	k8s.io/api v0.28.0
+	k8s.io/apimachinery v0.28.0
+	k8s.io/apiserver v0.28.0
+	k8s.io/client-go v0.28.0
+	k8s.io/component-base v0.28.0
+	k8s.io/component-helpers v0.28.0
+	k8s.io/csi-translation-lib v0.28.0
+	k8s.io/klog/v2 v2.100.1
+	sigs.k8s.io/controller-runtime v0.15.1
+	sigs.k8s.io/gateway-api v0.7.1
+	sigs.k8s.io/sig-storage-lib-external-provisioner/v9 v9.1.0-rc.0
 )
 
 require (
-	github.com/onsi/ginkgo/v2 v2.9.2
-	github.com/onsi/gomega v1.27.6
-	k8s.io/kubernetes v1.27.0
+	github.com/onsi/ginkgo/v2 v2.12.0
+	github.com/onsi/gomega v1.27.10
+	k8s.io/kubernetes v1.28.0
 )
 
 require (
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.4.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/emicklei/go-restful/v3 v3.10.1 // indirect
+	github.com/docker/distribution v2.8.2+incompatible // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-task/slim-sprig v2.20.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/cel-go v0.12.6 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
+	github.com/google/cel-go v0.16.0 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
+	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // 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/spdystream v0.2.0 // indirect
 	github.com/moby/sys/mountinfo v0.6.2 // 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/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/selinux v1.10.0 // indirect
+	github.com/opencontainers/selinux v1.11.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
-	github.com/spf13/cobra v1.6.0 // indirect
-	github.com/stoewer/go-strcase v1.2.0 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/spf13/cobra v1.7.0 // indirect
+	github.com/stoewer/go-strcase v1.3.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
 	go.opentelemetry.io/otel v1.10.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.17.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
 	go.opentelemetry.io/otel/metric v0.31.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.10.0 // indirect
 	go.opentelemetry.io/otel/trace v1.10.0 // indirect
-	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
 	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
+	golang.org/x/oauth2 v0.11.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/term v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.12.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.27.0 // indirect
-	k8s.io/cloud-provider v0.27.0 // indirect
-	k8s.io/controller-manager v0.27.0 // indirect
-	k8s.io/kms v0.27.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
+	k8s.io/apiextensions-apiserver v0.28.0 // indirect
+	k8s.io/cloud-provider v0.28.0 // indirect
+	k8s.io/controller-manager v0.28.0 // indirect
+	k8s.io/kms v0.28.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	k8s.io/kubectl v0.27.0 // indirect
 	k8s.io/kubelet v0.27.0 // indirect
 	k8s.io/mount-utils v0.27.0 // indirect
 	k8s.io/pod-security-admission v0.27.0 // indirect
-	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.4 // 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/structured-merge-diff/v4 v4.3.0 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-replace k8s.io/api => k8s.io/api v0.27.0
+replace k8s.io/api => k8s.io/api v0.28.0
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.0
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.0
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.28.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.27.0
+replace k8s.io/apiserver => k8s.io/apiserver v0.28.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.27.0
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.27.0
+replace k8s.io/client-go => k8s.io/client-go v0.28.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.27.0
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.0
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.0
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.0
 
-replace k8s.io/kms => k8s.io/kms v0.27.0
+replace k8s.io/code-generator => k8s.io/code-generator v0.28.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0
+replace k8s.io/component-base => k8s.io/component-base v0.28.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.27.0
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.28.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.0
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.28.0
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0
+replace k8s.io/cri-api => k8s.io/cri-api v0.28.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.0
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.0
+replace k8s.io/endpointslice => k8s.io/endpointslice v0.28.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.27.0
+replace k8s.io/kms => k8s.io/kms v0.28.0
 
-replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.0
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.0
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.0
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.0
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0
+replace k8s.io/kubectl => k8s.io/kubectl v0.28.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.27.0
+replace k8s.io/kubelet => k8s.io/kubelet v0.28.0
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.27.0
+replace k8s.io/metrics => k8s.io/metrics v0.28.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.28.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.0
+
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.0