STOR-859: Rebase to v4.0.0 for OCP 4.12

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.18-openshift-4.12
+  tag: rhel-8-release-golang-1.18-openshift-4.11

CHANGELOG/CHANGELOG-4.0.md

@@ -0,0 +1,71 @@
+# Release notes for v4.0.0
+
+[Documentation](https://kubernetes-csi.github.io)
+# Changelog since v3.5.0
+
+## Urgent Upgrade Notes
+
+### (No, really, you MUST read this before you upgrade)
+
+- Change `--default-fstype` from `ext4` to empty string. CSI drivers that depended on ext4 as the default need to change their deployments to explicitly set `--default-fstype=ext4`. ([#358](https://github.com/kubernetes-csi/external-attacher/pull/358), [@Kartik494](https://github.com/Kartik494))
+
+## Changes by Kind
+
+### Uncategorized
+
+- This release update kubernetes module dependencies to v1.25 ([#371](https://github.com/kubernetes-csi/external-attacher/pull/371), [@humblec](https://github.com/humblec))
+
+## Dependencies
+
+### Added
+- github.com/emicklei/go-restful/v3: [v3.8.0](https://github.com/emicklei/go-restful/v3/tree/v3.8.0)
+- github.com/go-task/slim-sprig: [348f09d](https://github.com/go-task/slim-sprig/tree/348f09d)
+- github.com/golang-jwt/jwt/v4: [v4.2.0](https://github.com/golang-jwt/jwt/v4/tree/v4.2.0)
+- github.com/golang/snappy: [v0.0.3](https://github.com/golang/snappy/tree/v0.0.3)
+- github.com/onsi/ginkgo/v2: [v2.1.4](https://github.com/onsi/ginkgo/v2/tree/v2.1.4)
+- google.golang.org/grpc/cmd/protoc-gen-go-grpc: v1.1.0
+
+### Changed
+- cloud.google.com/go: v0.81.0 → v0.97.0
+- github.com/Azure/go-autorest/autorest/adal: [v0.9.13 → v0.9.20](https://github.com/Azure/go-autorest/autorest/adal/compare/v0.9.13...v0.9.20)
+- github.com/Azure/go-autorest/autorest/mocks: [v0.4.1 → v0.4.2](https://github.com/Azure/go-autorest/autorest/mocks/compare/v0.4.1...v0.4.2)
+- github.com/Azure/go-autorest/autorest: [v0.11.18 → v0.11.27](https://github.com/Azure/go-autorest/autorest/compare/v0.11.18...v0.11.27)
+- github.com/cncf/udpa/go: [5459f2c → 04548b0](https://github.com/cncf/udpa/go/compare/5459f2c...04548b0)
+- github.com/cncf/xds/go: [fbca930 → cb28da3](https://github.com/cncf/xds/go/compare/fbca930...cb28da3)
+- github.com/envoyproxy/go-control-plane: [63b5d3c → 49ff273](https://github.com/envoyproxy/go-control-plane/compare/63b5d3c...49ff273)
+- github.com/go-logr/logr: [v1.2.0 → v1.2.3](https://github.com/go-logr/logr/compare/v1.2.0...v1.2.3)
+- github.com/go-logr/zapr: [v1.2.0 → v1.2.3](https://github.com/go-logr/zapr/compare/v1.2.0...v1.2.3)
+- github.com/golang/mock: [v1.5.0 → v1.6.0](https://github.com/golang/mock/compare/v1.5.0...v1.6.0)
+- github.com/google/go-cmp: [v0.5.5 → v0.5.6](https://github.com/google/go-cmp/compare/v0.5.5...v0.5.6)
+- github.com/google/martian/v3: [v3.1.0 → v3.2.1](https://github.com/google/martian/v3/compare/v3.1.0...v3.2.1)
+- github.com/google/pprof: [cbba55b → 4bb14d4](https://github.com/google/pprof/compare/cbba55b...4bb14d4)
+- github.com/googleapis/gax-go/v2: [v2.0.5 → v2.1.0](https://github.com/googleapis/gax-go/v2/compare/v2.0.5...v2.1.0)
+- github.com/matttproud/golang_protobuf_extensions: [c182aff → v1.0.1](https://github.com/matttproud/golang_protobuf_extensions/compare/c182aff...v1.0.1)
+- github.com/nxadm/tail: [v1.4.4 → v1.4.8](https://github.com/nxadm/tail/compare/v1.4.4...v1.4.8)
+- github.com/onsi/ginkgo: [v1.14.0 → v1.16.4](https://github.com/onsi/ginkgo/compare/v1.14.0...v1.16.4)
+- github.com/onsi/gomega: [v1.10.1 → v1.19.0](https://github.com/onsi/gomega/compare/v1.10.1...v1.19.0)
+- github.com/yuin/goldmark: [v1.4.1 → v1.4.13](https://github.com/yuin/goldmark/compare/v1.4.1...v1.4.13)
+- golang.org/x/crypto: 8634188 → 3147a52
+- golang.org/x/mod: 9b9b3d8 → 86c51ed
+- golang.org/x/net: cd36cc0 → a158d28
+- golang.org/x/sync: 036812b → 886fb93
+- golang.org/x/sys: 3681064 → 8c9f86f
+- golang.org/x/tools: 897bd77 → v0.1.12
+- google.golang.org/api: v0.43.0 → v0.57.0
+- google.golang.org/genproto: 42d7afd → c8bf987
+- google.golang.org/grpc: v1.40.0 → v1.47.0
+- google.golang.org/protobuf: v1.27.1 → v1.28.0
+- k8s.io/api: v0.24.0 → v0.25.0
+- k8s.io/apimachinery: v0.24.0 → v0.25.0
+- k8s.io/client-go: v0.24.0 → v0.25.0
+- k8s.io/component-base: v0.24.0 → v0.25.0
+- k8s.io/csi-translation-lib: v0.24.0 → v0.25.0
+- k8s.io/klog/v2: v2.60.1 → v2.70.1
+- k8s.io/kube-openapi: 3ee0da9 → 67bda5d
+- k8s.io/utils: 3a6ce19 → ee6ede2
+- sigs.k8s.io/json: 9f7c6b3 → f223a00
+- sigs.k8s.io/structured-merge-diff/v4: v4.2.1 → v4.2.3
+
+### Removed
+- github.com/emicklei/go-restful: [v2.9.5+incompatible](https://github.com/emicklei/go-restful/tree/v2.9.5)
+- github.com/form3tech-oss/jwt-go: [v3.2.3+incompatible](https://github.com/form3tech-oss/jwt-go/tree/v3.2.3)

Dockerfile.openshift.rhel7

@@ -1,8 +1,8 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-attacher
 COPY . .
 RUN make build
 
-FROM registry.ci.openshift.org/ocp/4.12:base
+FROM registry.ci.openshift.org/ocp/4.11:base
 COPY --from=builder /go/src/github.com/kubernetes-csi/external-attacher/bin/csi-attacher /usr/bin/
 ENTRYPOINT ["/usr/bin/csi-attacher"]

README.md

@@ -12,7 +12,7 @@ It is **not** an attach/detach operation performed by a code running on a node,
 
 ## Overview
 
-The external-attacher is an external controller that monitors `VolumeAttachment` objects created by controller-manager and attaches/detaches volumes to/from nodes (i.e. calls `ControllerPublish`/`ControllerUnpublish`. Full design can be found at Kubernetes proposal at [container-storage-interface.md](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/storage/container-storage-interface.md)
+The external-attacher is an external controller that monitors `VolumeAttachment` objects created by controller-manager and attaches/detaches volumes to/from nodes (i.e. calls `ControllerPublish`/`ControllerUnpublish`. Full design can be found at Kubernetes proposal at [container-storage-interface.md](https://github.com/kubernetes/design-proposals-archive/blob/main/storage/container-storage-interface.md)
 
 ## Compatibility
 
@@ -83,7 +83,7 @@ Note that the external-attacher does not scale with more replicas. Only one exte
 
 * `--leader-election-retry-period <duration>`: Duration, in seconds, the LeaderElector clients should wait between tries of actions. Defaults to 5 seconds.
 
-* `--default-fstype <type>`: The default filesystem type of the volume to publish. Defaults to `ext4`.
+* `--default-fstype <type>`: The default filesystem type of the volume to publish. Defaults to empty string.
 
 #### Other recognized arguments
 

cmd/csi-attacher/main.go

@@ -66,7 +66,7 @@ var (
 	leaderElectionRenewDeadline = flag.Duration("leader-election-renew-deadline", 10*time.Second, "Duration, in seconds, that the acting leader will retry refreshing leadership before giving up. Defaults to 10 seconds.")
 	leaderElectionRetryPeriod   = flag.Duration("leader-election-retry-period", 5*time.Second, "Duration, in seconds, the LeaderElector clients should wait between tries of actions. Defaults to 5 seconds.")
 
-	defaultFSType = flag.String("default-fstype", "ext4", "The default filesystem type of the volume to publish.")
+	defaultFSType = flag.String("default-fstype", "", "The default filesystem type of the volume to publish. Defaults to empty string")
 
 	reconcileSync = flag.Duration("reconcile-sync", 1*time.Minute, "Resync interval of the VolumeAttachment reconciler.")
 

deploy/kubernetes/deployment.yaml

@@ -33,7 +33,7 @@ spec:
       serviceAccount: csi-attacher
       containers:
         - name: csi-attacher
-          image: gcr.io/k8s-staging-sig-storage/csi-attacher:canary
+          image: registry.k8s.io/k8s-staging-sig-storage/csi-attacher:v3.5.0
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"

go.mod

@@ -1,77 +1,124 @@
 module github.com/kubernetes-csi/external-attacher
 
-go 1.16
+go 1.18
 
 require (
 	github.com/container-storage-interface/spec v1.5.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/evanphx/json-patch v4.12.0+incompatible
-	github.com/golang/mock v1.5.0
+	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/kubernetes-csi/csi-lib-utils v0.11.0
 	github.com/kubernetes-csi/csi-test/v4 v4.0.2
-	google.golang.org/grpc v1.40.0
+	google.golang.org/grpc v1.47.0
+	k8s.io/api v0.25.0
+	k8s.io/apimachinery v0.25.0
+	k8s.io/client-go v0.25.0
+	k8s.io/csi-translation-lib v0.25.0
+	k8s.io/klog/v2 v2.70.1
+)
+
+require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // 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/emicklei/go-restful/v3 v3.8.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.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.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/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.24.0
-	k8s.io/apimachinery v0.24.0
-	k8s.io/client-go v0.24.0
 	k8s.io/component-base v0.23.0 // indirect
-	k8s.io/csi-translation-lib v0.23.6
-	k8s.io/klog/v2 v2.60.1
+	k8s.io/klog v1.0.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+	k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )
 
-replace k8s.io/api => k8s.io/api v0.24.0
+replace k8s.io/api => k8s.io/api v0.25.0
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.24.0
+replace k8s.io/apiserver => k8s.io/apiserver v0.25.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.24.0
+replace k8s.io/client-go => k8s.io/client-go v0.25.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.24.0
+replace k8s.io/code-generator => k8s.io/code-generator v0.25.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.24.0
+replace k8s.io/component-base => k8s.io/component-base v0.25.0
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.0
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.24.0
+replace k8s.io/cri-api => k8s.io/cri-api v0.25.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.24.0
+replace k8s.io/kubectl => k8s.io/kubectl v0.25.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.24.0
+replace k8s.io/kubelet => k8s.io/kubelet v0.25.0
 
-replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.24.0
+replace k8s.io/metrics => k8s.io/metrics v0.25.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.0
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0
 
-replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.0
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.0
 
-replace k8s.io/sample-controller => k8s.io/sample-controller v0.24.0
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.0