Merge pull request #37 from RomanBednar/rebase-v3.4.0

Bug 2043130: Rebase to v3.4.0 for OCP 4.10
openshift · Jan 25, 2022 · 27e71f2 · 27e71f2
2 parents 9445dfa + cbd5899
commit 27e71f2
Show file tree

Hide file tree

Showing 691 changed files with 45,796 additions and 9,359 deletions.
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.16-openshift-4.10
+  tag: rhel-8-release-golang-1.17-openshift-4.10
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG/CHANGELOG-3.4.md b/CHANGELOG/CHANGELOG-3.4.md
@@ -0,0 +1,95 @@
+# Release notes for v3.4.0
+
+[Documentation](https://kubernetes-csi.github.io)
+# Changelog since v3.3.0
+
+## Changes by Kind
+
+### Uncategorized
+
+- The external-attacher now ignores changes in `VolumeAttachment.metadata.managedFields`, saving some CPU. ([#338](https://github.com/kubernetes-csi/external-attacher/pull/338), [@uzuku](https://github.com/uzuku))
+- Updated Kubernetes libraries to 1.23.0. ([#339](https://github.com/kubernetes-csi/external-attacher/pull/339), [@humblec](https://github.com/humblec))
+
+## Dependencies
+
+### Added
+- github.com/cncf/xds/go: [fbca930](https://github.com/cncf/xds/go/tree/fbca930)
+- github.com/coreos/go-systemd/v22: [v22.3.2](https://github.com/coreos/go-systemd/v22/tree/v22.3.2)
+- github.com/getkin/kin-openapi: [v0.76.0](https://github.com/getkin/kin-openapi/tree/v0.76.0)
+- github.com/go-logr/zapr: [v1.2.0](https://github.com/go-logr/zapr/tree/v1.2.0)
+- github.com/godbus/dbus/v5: [v5.0.4](https://github.com/godbus/dbus/v5/tree/v5.0.4)
+- github.com/gorilla/mux: [v1.8.0](https://github.com/gorilla/mux/tree/v1.8.0)
+- github.com/kr/fs: [v0.1.0](https://github.com/kr/fs/tree/v0.1.0)
+- github.com/pkg/sftp: [v1.10.1](https://github.com/pkg/sftp/tree/v1.10.1)
+- go.etcd.io/etcd/api/v3: v3.5.0
+- go.etcd.io/etcd/client/pkg/v3: v3.5.0
+- go.etcd.io/etcd/client/v2: v2.305.0
+- go.uber.org/goleak: v1.1.10
+- sigs.k8s.io/json: c049b76
+
+### Changed
+- cloud.google.com/go: v0.65.0 → v0.81.0
+- github.com/benbjohnson/clock: [v1.0.3 → v1.1.0](https://github.com/benbjohnson/clock/compare/v1.0.3...v1.1.0)
+- github.com/bketelsen/crypt: [5cbc8cc → v0.0.4](https://github.com/bketelsen/crypt/compare/5cbc8cc...v0.0.4)
+- github.com/envoyproxy/go-control-plane: [668b12f → 63b5d3c](https://github.com/envoyproxy/go-control-plane/compare/668b12f...63b5d3c)
+- github.com/evanphx/json-patch: [v4.11.0+incompatible → v4.12.0+incompatible](https://github.com/evanphx/json-patch/compare/v4.11.0...v4.12.0)
+- github.com/go-logr/logr: [v0.4.0 → v1.2.0](https://github.com/go-logr/logr/compare/v0.4.0...v1.2.0)
+- github.com/go-openapi/jsonpointer: [v0.19.3 → v0.19.5](https://github.com/go-openapi/jsonpointer/compare/v0.19.3...v0.19.5)
+- github.com/golang/mock: [v1.4.4 → v1.5.0](https://github.com/golang/mock/compare/v1.4.4...v1.5.0)
+- github.com/google/martian/v3: [v3.0.0 → v3.1.0](https://github.com/google/martian/v3/compare/v3.0.0...v3.1.0)
+- github.com/google/pprof: [1a94d86 → cbba55b](https://github.com/google/pprof/compare/1a94d86...cbba55b)
+- github.com/ianlancetaylor/demangle: [5e5cf60 → 28f6c0f](https://github.com/ianlancetaylor/demangle/compare/5e5cf60...28f6c0f)
+- github.com/json-iterator/go: [v1.1.11 → v1.1.12](https://github.com/json-iterator/go/compare/v1.1.11...v1.1.12)
+- github.com/magiconair/properties: [v1.8.1 → v1.8.5](https://github.com/magiconair/properties/compare/v1.8.1...v1.8.5)
+- github.com/mitchellh/go-homedir: [v1.1.0 → v1.0.0](https://github.com/mitchellh/go-homedir/compare/v1.1.0...v1.0.0)
+- github.com/mitchellh/mapstructure: [v1.1.2 → v1.4.1](https://github.com/mitchellh/mapstructure/compare/v1.1.2...v1.4.1)
+- github.com/modern-go/reflect2: [v1.0.1 → v1.0.2](https://github.com/modern-go/reflect2/compare/v1.0.1...v1.0.2)
+- github.com/pelletier/go-toml: [v1.2.0 → v1.9.3](https://github.com/pelletier/go-toml/compare/v1.2.0...v1.9.3)
+- github.com/prometheus/common: [v0.26.0 → v0.28.0](https://github.com/prometheus/common/compare/v0.26.0...v0.28.0)
+- github.com/spf13/afero: [v1.2.2 → v1.6.0](https://github.com/spf13/afero/compare/v1.2.2...v1.6.0)
+- github.com/spf13/cast: [v1.3.0 → v1.3.1](https://github.com/spf13/cast/compare/v1.3.0...v1.3.1)
+- github.com/spf13/cobra: [v1.1.3 → v1.2.1](https://github.com/spf13/cobra/compare/v1.1.3...v1.2.1)
+- github.com/spf13/jwalterweatherman: [v1.0.0 → v1.1.0](https://github.com/spf13/jwalterweatherman/compare/v1.0.0...v1.1.0)
+- github.com/spf13/viper: [v1.7.0 → v1.8.1](https://github.com/spf13/viper/compare/v1.7.0...v1.8.1)
+- github.com/yuin/goldmark: [v1.3.5 → v1.4.0](https://github.com/yuin/goldmark/compare/v1.3.5...v1.4.0)
+- go.opencensus.io: v0.22.4 → v0.23.0
+- go.uber.org/zap: v1.17.0 → v1.19.0
+- golang.org/x/crypto: 5ea612d → 32db794
+- golang.org/x/net: 37e1c6a → e898025
+- golang.org/x/oauth2: cd4f82c → 2bc19b1
+- golang.org/x/sys: 59db8d7 → f4d4317
+- golang.org/x/term: de623e6 → 6886f2d
+- golang.org/x/text: v0.3.6 → v0.3.7
+- golang.org/x/tools: v0.1.2 → d4cc65f
+- google.golang.org/api: v0.30.0 → v0.44.0
+- google.golang.org/genproto: f16073e → fe13028
+- google.golang.org/grpc: v1.38.0 → v1.40.0
+- google.golang.org/protobuf: v1.26.0 → v1.27.1
+- gopkg.in/ini.v1: v1.51.0 → v1.62.0
+- k8s.io/api: v0.22.0 → v0.23.0
+- k8s.io/apimachinery: v0.22.0 → v0.23.0
+- k8s.io/client-go: v0.22.0 → v0.23.0
+- k8s.io/component-base: v0.22.0 → v0.23.0
+- k8s.io/csi-translation-lib: v0.22.0 → v0.23.0
+- k8s.io/gengo: 3a45101 → 485abfe
+- k8s.io/klog/v2: v2.9.0 → v2.30.0
+- k8s.io/kube-openapi: 9528897 → e816edb
+- k8s.io/utils: 4b05e18 → cb0fa31
+
+### Removed
+- github.com/coreos/bbolt: [v1.3.2](https://github.com/coreos/bbolt/tree/v1.3.2)
+- github.com/coreos/etcd: [v3.3.13+incompatible](https://github.com/coreos/etcd/tree/v3.3.13)
+- github.com/coreos/go-systemd: [95778df](https://github.com/coreos/go-systemd/tree/95778df)
+- github.com/coreos/pkg: [399ea9e](https://github.com/coreos/pkg/tree/399ea9e)
+- github.com/dgrijalva/jwt-go: [v3.2.0+incompatible](https://github.com/dgrijalva/jwt-go/tree/v3.2.0)
+- github.com/dgryski/go-sip13: [e10d5fe](https://github.com/dgryski/go-sip13/tree/e10d5fe)
+- github.com/grpc-ecosystem/go-grpc-middleware: [v1.0.0](https://github.com/grpc-ecosystem/go-grpc-middleware/tree/v1.0.0)
+- github.com/grpc-ecosystem/go-grpc-prometheus: [v1.2.0](https://github.com/grpc-ecosystem/go-grpc-prometheus/tree/v1.2.0)
+- github.com/jonboulle/clockwork: [v0.1.0](https://github.com/jonboulle/clockwork/tree/v0.1.0)
+- github.com/oklog/ulid: [v1.3.1](https://github.com/oklog/ulid/tree/v1.3.1)
+- github.com/prometheus/tsdb: [v0.7.1](https://github.com/prometheus/tsdb/tree/v0.7.1)
+- github.com/soheilhy/cmux: [v0.1.4](https://github.com/soheilhy/cmux/tree/v0.1.4)
+- github.com/tmc/grpc-websocket-proxy: [0ad062e](https://github.com/tmc/grpc-websocket-proxy/tree/0ad062e)
+- github.com/xiang90/probing: [43a291a](https://github.com/xiang90/probing/tree/43a291a)
+- go.etcd.io/bbolt: v1.3.2
+- gopkg.in/resty.v1: v1.12.0
diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-attacher
 COPY . .
 RUN make build

diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/kubernetes-csi/external-attacher.svg?branch=master)](https://travis-ci.org/kubernetes-csi/external-attacher)
-
 # CSI attacher
 
 The external-attacher is a sidecar container that attaches volumes to nodes by calling `ControllerPublish` and `ControllerUnpublish` functions of CSI drivers. It is necessary because internal Attach/Detach controller running in Kubernetes controller-manager does not have any direct interfaces to CSI drivers.

diff --git a/cmd/csi-attacher/main.go b/cmd/csi-attacher/main.go
@@ -46,8 +46,6 @@ const (
 
 	// Default timeout of short CSI calls like GetPluginInfo
 	csiTimeout = time.Second
-
-	leaderElectionTypeLeases = "leases"
 )
 
 // Command line flags
@@ -82,11 +80,6 @@ var (
 	version = "unknown"
 )
 
-type leaderElection interface {
-	Run() error
-	WithNamespace(namespace string)
-}
-
 func main() {
 	klog.InitFlags(nil)
 	flag.Set("logtostderr", "true")

diff --git a/go.mod b/go.mod
@@ -5,20 +5,72 @@ go 1.16
 require (
 	github.com/container-storage-interface/spec v1.5.0
 	github.com/davecgh/go-spew v1.1.1
-	github.com/evanphx/json-patch v4.11.0+incompatible
-	github.com/golang/mock v1.4.4
+	github.com/evanphx/json-patch v4.12.0+incompatible
+	github.com/golang/mock v1.5.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.10.0
 	github.com/kubernetes-csi/csi-test/v4 v4.0.2
-	golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84 // indirect
-	golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/grpc v1.38.0
-	k8s.io/api v0.22.0
-	k8s.io/apimachinery v0.22.0
-	k8s.io/client-go v0.22.0
-	k8s.io/csi-translation-lib v0.22.0
-	k8s.io/klog/v2 v2.9.0
+	google.golang.org/grpc v1.40.0
+	k8s.io/api v0.23.0
+	k8s.io/apimachinery v0.23.0
+	k8s.io/client-go v0.23.0
+	k8s.io/component-base v0.23.0 // indirect
+	k8s.io/csi-translation-lib v0.23.0
+	k8s.io/klog/v2 v2.30.0
 )
+
+replace k8s.io/api => k8s.io/api v0.23.0
+
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
+
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.23.0
+
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
+
+replace k8s.io/client-go => k8s.io/client-go v0.23.0
+
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
+
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
+
+replace k8s.io/code-generator => k8s.io/code-generator v0.23.0
+
+replace k8s.io/component-base => k8s.io/component-base v0.23.0
+
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
+
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
+
+replace k8s.io/cri-api => k8s.io/cri-api v0.23.0
+
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
+
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
+
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
+
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
+
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
+
+replace k8s.io/kubectl => k8s.io/kubectl v0.23.0
+
+replace k8s.io/kubelet => k8s.io/kubelet v0.23.0
+
+replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
+
+replace k8s.io/metrics => k8s.io/metrics v0.23.0
+
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
+
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0
+
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
+
+replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.0
+
+replace k8s.io/sample-controller => k8s.io/sample-controller v0.23.0