OCPBUGS-12503: STOR-1169: Rebase external-provisioner to v3.5.0 for OCP 4.14

.prow.sh

@@ -1,28 +1,62 @@
 #! /bin/bash
 
+CSI_PROW_SIDECAR_E2E_IMPORT_PATH="github.com/kubernetes-csi/external-provisioner/test/e2e"
+
 . release-tools/prow.sh
 
-# External-provisioner is updated to use VolumeSnapshot v1 APIs. As a result,
-# tesing on Kubernetes version < 1.20 are no longer supported because they use
-# v1beta1 or earlier VolumeSnapshot APIs.
-# TODO: The check can be removed when all Prow jobs for Kubernetes < 1.20 are removed.
-if ! (version_gt "${CSI_PROW_KUBERNETES_VERSION}" "1.19.255" || [ "${CSI_PROW_KUBERNETES_VERSION}" == "latest" ]); then
-    filtered_tests=
-    skipped_tests=
-    for test in ${CSI_PROW_TESTS}; do
-	case "$test" in
-	    parallel | serial | parallel-alpha | serial-alpha)
-		skipped_tests="$skipped_tests $test"
-		;;
-	    *)
-		filtered_tests="$filtered_tests $test"
-		;;
-	esac
+volume_mode_conversion () {
+   [ "${VOLUME_MODE_CONVERSION_TESTS}" == "true" ]
+}
+
+if volume_mode_conversion; then
+  install_snapshot_controller() {
+      CONTROLLER_DIR="https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/${CSI_SNAPSHOTTER_VERSION}"
+      if [[ ${REPO_DIR} == *"external-snapshotter"* ]]; then
+          CONTROLLER_DIR="${REPO_DIR}"
+      fi
+      SNAPSHOT_RBAC_YAML="${CONTROLLER_DIR}/deploy/kubernetes/snapshot-controller/rbac-snapshot-controller.yaml"
+      echo "kubectl apply -f ${SNAPSHOT_RBAC_YAML}"
+      # Ignore: Double quote to prevent globbing and word splitting.
+      # shellcheck disable=SC2086
+      kubectl apply -f ${SNAPSHOT_RBAC_YAML}
+
+      cnt=0
+      until kubectl get clusterrolebinding snapshot-controller-role; do
+         if [ $cnt -gt 30 ]; then
+            echo "Cluster role bindings:"
+            kubectl describe clusterrolebinding
+            echo >&2 "ERROR: snapshot controller RBAC not ready after over 5 min"
+            exit 1
+        fi
+        echo "$(date +%H:%M:%S)" "waiting for snapshot RBAC setup complete, attempt #$cnt"
+    	cnt=$((cnt + 1))
+        sleep 10
+      done
+
+    SNAPSHOT_CONTROLLER_YAML="${CSI_PROW_WORK}/snapshot-controller.yaml"
+    run curl "${CONTROLLER_DIR}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml" --output "${SNAPSHOT_CONTROLLER_YAML}" --silent --location
+
+    echo "Enabling prevent-volume-mode-conversion in snapshot-controller"
+    sed -i -e 's/# end snapshot controller args/- \"--prevent-volume-mode-conversion=true\"\n            # end snapshot controller args/' "${SNAPSHOT_CONTROLLER_YAML}"
+
+    echo "kubectl apply -f $SNAPSHOT_CONTROLLER_YAML"
+    kubectl apply -f "$SNAPSHOT_CONTROLLER_YAML"
+
+    cnt=0
+    expected_running_pods=$(kubectl apply --dry-run=client -o "jsonpath={.spec.replicas}" -f "$SNAPSHOT_CONTROLLER_YAML")
+    expected_namespace=$(kubectl apply --dry-run=client -o "jsonpath={.metadata.namespace}" -f "$SNAPSHOT_CONTROLLER_YAML")
+    while [ "$(kubectl get pods -n "$expected_namespace" -l app=snapshot-controller | grep 'Running' -c)" -lt "$expected_running_pods" ]; do
+      if [ $cnt -gt 30 ]; then
+        echo "snapshot-controller pod status:"
+        kubectl describe pods -n "$expected_namespace" -l app=snapshot-controller
+        echo >&2 "ERROR: snapshot controller not ready after over 5 min"
+        exit 1
+      fi
+      echo "$(date +%H:%M:%S)" "waiting for snapshot controller deployment to complete, attempt #$cnt"
+	  cnt=$((cnt + 1))
+      sleep 10
     done
-    if [ "$skipped_tests" ]; then
-	info "Testing on Kubernetes ${CSI_PROW_KUBERNETES_VERSION} is no longer supported. Skipping CSI_PROW_TESTS: $skipped_tests."
-	CSI_PROW_TESTS="$filtered_tests"
-    fi
+  }
 fi
 
 main

cmd/csi-provisioner/csi-provisioner.go

@@ -53,8 +53,8 @@ import (
 	_ "k8s.io/component-base/metrics/prometheus/workqueue"               // register work queues in the default legacy registry
 	csitrans "k8s.io/csi-translation-lib"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller"
-	libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v8/controller/metrics"
+	"sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller"
+	libmetrics "sigs.k8s.io/sig-storage-lib-external-provisioner/v9/controller/metrics"
 
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"

go.mod

@@ -1,82 +1,191 @@
 module github.com/kubernetes-csi/external-provisioner
 
-go 1.19
+go 1.20
 
 require (
-	github.com/container-storage-interface/spec v1.7.0
+	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/imdario/mergo v0.3.12 // indirect
-	github.com/kubernetes-csi/csi-lib-utils v0.12.0
+	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/kubernetes-csi/csi-lib-utils v0.13.0
 	github.com/kubernetes-csi/csi-test/v5 v5.0.0
-	github.com/kubernetes-csi/external-snapshotter/client/v6 v6.1.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.14.0
+	github.com/prometheus/client_golang v1.15.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.1
-	google.golang.org/grpc v1.51.0
-	google.golang.org/protobuf v1.28.1
-	k8s.io/api v0.26.0
-	k8s.io/apimachinery v0.26.0
-	k8s.io/apiserver v0.26.0
-	k8s.io/client-go v0.26.0
-	k8s.io/component-base v0.26.0
-	k8s.io/component-helpers v0.26.0
-	k8s.io/csi-translation-lib v0.26.0
-	k8s.io/klog/v2 v2.80.1
-	sigs.k8s.io/controller-runtime v0.14.1
-	sigs.k8s.io/gateway-api v0.6.0
-	sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0
+	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
 )
 
 require (
+	github.com/onsi/ginkgo/v2 v2.9.2
+	github.com/onsi/gomega v1.27.6
+	k8s.io/kubernetes v1.27.0
+)
+
+require (
+	github.com/NYTimes/gziphandler v1.1.1 // indirect
+	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // 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/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.3 // 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/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
+	github.com/emicklei/go-restful/v3 v3.10.1 // 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-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // 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/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // 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/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/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.2 // 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/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.37.0 // indirect
-	github.com/prometheus/procfs v0.8.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
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/net v0.4.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/term v0.3.0 // indirect
-	golang.org/x/text v0.5.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
+	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/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
+	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/oauth2 v0.5.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // 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/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
+	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 k8s.io/api => k8s.io/api v0.27.0
+
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.0
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.0
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.27.0
+
+replace k8s.io/client-go => k8s.io/client-go v0.27.0
+
+replace k8s.io/code-generator => k8s.io/code-generator v0.27.0
+
+replace k8s.io/component-base => k8s.io/component-base v0.27.0
+
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.0
+
+replace k8s.io/kms => k8s.io/kms v0.27.0
+
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.0
+
+replace k8s.io/kubectl => k8s.io/kubectl v0.27.0
+
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.0
+
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.0
+
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.0
+
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.0
+
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.0
+
+replace k8s.io/cri-api => k8s.io/cri-api v0.27.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.27.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.27.0
+
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.0
+
+replace k8s.io/kubelet => k8s.io/kubelet v0.27.0
+
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.0
+
+replace k8s.io/metrics => k8s.io/metrics v0.27.0
+
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.0
+
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.0