Merge pull request kubernetes-csi#54 from mpatlasov/rebase-v4.3.0

STOR-1169: Rebase `external-attacher` to v4.3.0 for OCP 4.14

CHANGELOG/CHANGELOG-4.2.md

@@ -0,0 +1,30 @@
+# Release notes for v4.2.0
+
+[Documentation](https://kubernetes-csi.github.io)
+
+# Changelog since v4.1.1
+
+## Changes by Kind
+
+### Feature
+
+- Logging for gRPC call can now be limited configurably with flag `--max-grpc-log-length` ([#411](https://github.com/kubernetes-csi/external-attacher/pull/411), [@leiyiz](https://github.com/leiyiz))
+
+## Dependencies
+
+### Added
+- cloud.google.com/go/compute: v1.12.1
+
+### Changed
+- cloud.google.com/go/compute/metadata: v0.2.0 → v0.2.1
+- github.com/kubernetes-csi/csi-lib-utils: [v0.12.0 → v0.13.0](https://github.com/kubernetes-csi/csi-lib-utils/compare/v0.12.0...v0.13.0)
+- google.golang.org/genproto: 142d8a6 → 1645502
+- google.golang.org/grpc: v1.51.0 → v1.52.3
+- k8s.io/api: v0.26.0 → v0.26.1
+- k8s.io/apimachinery: v0.26.0 → v0.26.1
+- k8s.io/client-go: v0.26.0 → v0.26.1
+- k8s.io/csi-translation-lib: v0.26.0 → v0.26.1
+- k8s.io/klog/v2: v2.80.1 → v2.90.0
+
+### Removed
+_Nothing has changed._

CHANGELOG/CHANGELOG-4.3.md

@@ -0,0 +1,74 @@
+# Release notes for v4.3.0
+
+[Documentation](https://kubernetes-csi.github.io)
+
+# Changelog since v4.2.0
+
+## Changes by Kind
+
+### Bug or Regression
+
+- Fix: CVE-2022-41723 ([#415](https://github.com/kubernetes-csi/external-attacher/pull/415), [@andyzhangx](https://github.com/andyzhangx))
+
+## Dependencies
+
+### Added
+- cloud.google.com/go/errorreporting: v0.3.0
+- cloud.google.com/go/firestore: v1.9.0
+- cloud.google.com/go/logging: v1.6.1
+- cloud.google.com/go/maps: v0.1.0
+- cloud.google.com/go/pubsublite: v1.5.0
+- cloud.google.com/go/spanner: v1.41.0
+- cloud.google.com/go/vmwareengine: v0.1.0
+- github.com/creack/pty: [v1.1.9](https://github.com/creack/pty/tree/v1.1.9)
+
+### Changed
+- cloud.google.com/go/aiplatform: v1.24.0 → v1.27.0
+- cloud.google.com/go/bigquery: v1.43.0 → v1.44.0
+- cloud.google.com/go/compute/metadata: v0.2.1 → v0.2.3
+- cloud.google.com/go/compute: v1.12.1 → v1.15.1
+- cloud.google.com/go/datastore: v1.1.0 → v1.10.0
+- cloud.google.com/go/iam: v0.7.0 → v0.8.0
+- cloud.google.com/go/pubsub: v1.3.1 → v1.27.1
+- github.com/census-instrumentation/opencensus-proto: [v0.2.1 → v0.4.1](https://github.com/census-instrumentation/opencensus-proto/compare/v0.2.1...v0.4.1)
+- github.com/cespare/xxhash/v2: [v2.1.2 → v2.2.0](https://github.com/cespare/xxhash/v2/compare/v2.1.2...v2.2.0)
+- github.com/cncf/udpa/go: [04548b0 → c52dc94](https://github.com/cncf/udpa/go/compare/04548b0...c52dc94)
+- github.com/cncf/xds/go: [cb28da3 → 06c439d](https://github.com/cncf/xds/go/compare/cb28da3...06c439d)
+- github.com/container-storage-interface/spec: [v1.7.0 → v1.8.0](https://github.com/container-storage-interface/spec/compare/v1.7.0...v1.8.0)
+- github.com/envoyproxy/go-control-plane: [49ff273 → v0.10.3](https://github.com/envoyproxy/go-control-plane/compare/49ff273...v0.10.3)
+- github.com/envoyproxy/protoc-gen-validate: [v0.1.0 → v0.9.1](https://github.com/envoyproxy/protoc-gen-validate/compare/v0.1.0...v0.9.1)
+- github.com/go-openapi/jsonpointer: [v0.19.5 → v0.19.6](https://github.com/go-openapi/jsonpointer/compare/v0.19.5...v0.19.6)
+- github.com/go-openapi/jsonreference: [v0.20.0 → v0.20.1](https://github.com/go-openapi/jsonreference/compare/v0.20.0...v0.20.1)
+- github.com/golang/glog: [23def4e → v1.0.0](https://github.com/golang/glog/compare/23def4e...v1.0.0)
+- github.com/golang/protobuf: [v1.5.2 → v1.5.3](https://github.com/golang/protobuf/compare/v1.5.2...v1.5.3)
+- github.com/google/pprof: [94a9f03 → 4bb14d4](https://github.com/google/pprof/compare/94a9f03...4bb14d4)
+- github.com/kr/pretty: [v0.2.0 → v0.3.0](https://github.com/kr/pretty/compare/v0.2.0...v0.3.0)
+- github.com/onsi/ginkgo/v2: [v2.4.0 → v2.9.1](https://github.com/onsi/ginkgo/v2/compare/v2.4.0...v2.9.1)
+- github.com/onsi/gomega: [v1.23.0 → v1.27.4](https://github.com/onsi/gomega/compare/v1.23.0...v1.27.4)
+- github.com/rogpeppe/go-internal: [v1.3.0 → v1.10.0](https://github.com/rogpeppe/go-internal/compare/v1.3.0...v1.10.0)
+- github.com/stretchr/objx: [v0.1.1 → v0.5.0](https://github.com/stretchr/objx/compare/v0.1.1...v0.5.0)
+- github.com/stretchr/testify: [v1.8.0 → v1.8.1](https://github.com/stretchr/testify/compare/v1.8.0...v1.8.1)
+- golang.org/x/mod: 86c51ed → v0.8.0
+- golang.org/x/net: v0.4.0 → v0.8.0
+- golang.org/x/oauth2: v0.2.0 → v0.4.0
+- golang.org/x/sys: v0.3.0 → v0.6.0
+- golang.org/x/term: v0.3.0 → v0.6.0
+- golang.org/x/text: v0.5.0 → v0.8.0
+- golang.org/x/tools: v0.1.12 → v0.7.0
+- golang.org/x/xerrors: 5ec99f8 → 04be3eb
+- google.golang.org/genproto: 1645502 → 76db087
+- google.golang.org/grpc: v1.52.3 → v1.54.0
+- k8s.io/api: v0.26.1 → v0.27.1
+- k8s.io/apimachinery: v0.26.1 → v0.27.1
+- k8s.io/client-go: v0.26.1 → v0.27.1
+- k8s.io/csi-translation-lib: v0.26.1 → v0.27.1
+- k8s.io/klog/v2: v2.90.0 → v2.90.1
+- k8s.io/kube-openapi: a28e98e → 15aac26
+- k8s.io/utils: 8e77b1f → a36077c
+- sigs.k8s.io/json: f223a00 → bc3834c
+
+### Removed
+- github.com/PuerkitoBio/purell: [v1.1.1](https://github.com/PuerkitoBio/purell/tree/v1.1.1)
+- github.com/PuerkitoBio/urlesc: [de5bf2a](https://github.com/PuerkitoBio/urlesc/tree/de5bf2a)
+- github.com/elazarl/goproxy: [947c36d](https://github.com/elazarl/goproxy/tree/947c36d)
+- github.com/niemeyer/pretty: [a10e7ca](https://github.com/niemeyer/pretty/tree/a10e7ca)

cmd/csi-attacher/main.go

@@ -76,6 +76,8 @@ var (
 
 	kubeAPIQPS   = flag.Float64("kube-api-qps", 5, "QPS to use while communicating with the kubernetes apiserver. Defaults to 5.0.")
 	kubeAPIBurst = flag.Int("kube-api-burst", 10, "Burst to use while communicating with the kubernetes apiserver. Defaults to 10.")
+
+	maxGRPCLogLength = flag.Int("max-grpc-log-length", -1, "The maximum amount of characters logged for every grpc responses. Defaults to no limit")
 )
 
 var (
@@ -127,6 +129,7 @@ func main() {
 	metricsManager := metrics.NewCSIMetricsManager("" /* driverName */)
 
 	// Connect to CSI.
+	connection.SetMaxGRPCLogLength(*maxGRPCLogLength)
 	csiConn, err := connection.Connect(*csiAddress, metricsManager, connection.OnConnectionLoss(connection.ExitOnConnectionLoss()))
 	if err != nil {
 		klog.Error(err.Error())

go.mod

@@ -1,37 +1,38 @@
 module github.com/kubernetes-csi/external-attacher
 
-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/davecgh/go-spew v1.1.1
 	github.com/evanphx/json-patch v5.6.0+incompatible
 	github.com/golang/mock v1.6.0
-	github.com/golang/protobuf v1.5.2
-	github.com/kubernetes-csi/csi-lib-utils v0.12.0
+	github.com/golang/protobuf v1.5.3
+	github.com/kubernetes-csi/csi-lib-utils v0.13.0
 	github.com/kubernetes-csi/csi-test/v4 v4.4.0
-	google.golang.org/grpc v1.51.0
-	k8s.io/api v0.26.0
-	k8s.io/apimachinery v0.26.0
-	k8s.io/client-go v0.26.0
-	k8s.io/csi-translation-lib v0.26.0
-	k8s.io/klog/v2 v2.80.1
+	google.golang.org/grpc v1.54.0
+	k8s.io/api v0.27.1
+	k8s.io/apimachinery v0.27.1
+	k8s.io/client-go v0.27.1
+	k8s.io/csi-translation-lib v0.27.1
+	k8s.io/klog/v2 v2.90.1
 )
 
 require (
 	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/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.10.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-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/gnostic v0.6.9 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -46,22 +47,22 @@ require (
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.4.0 // indirect
-	golang.org/x/oauth2 v0.2.0 // 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
+	golang.org/x/net v0.8.0 // indirect
+	golang.org/x/oauth2 v0.4.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.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221111202108-142d8a6fa32e // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/protobuf v1.28.1 // 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/component-base v0.26.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
-	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
+	k8s.io/utils v0.0.0-20230209194617-a36077c30491 // 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
 )