From a3b63478dace4ba4da0f07afd815aee29496c276 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Tue, 23 Feb 2021 12:36:41 +0100
Subject: [PATCH 1/2] release v4.1.0

Bumping minor version because of the new features.
---
 CHANGELOG/CHANGELOG-4.1.md | 54 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 CHANGELOG/CHANGELOG-4.1.md

diff --git a/CHANGELOG/CHANGELOG-4.1.md b/CHANGELOG/CHANGELOG-4.1.md
new file mode 100644
index 00000000..4b53396a
--- /dev/null
+++ b/CHANGELOG/CHANGELOG-4.1.md
@@ -0,0 +1,54 @@
+# Release notes for v4.1.0
+
+# Changelog since v4.0.2
+
+## Changes by Kind
+
+### Feature
+ - Mock driver: optionally proxy connections instead of handling them directly ([#314](https://github.com/kubernetes-csi/csi-test/pull/314), [@pohly](https://github.com/pohly))
+ - csi-sanity: clean up sourced volumes prior to deleting sourcing resources ([#297](https://github.com/kubernetes-csi/csi-test/pull/297), [@timoreimann](https://github.com/timoreimann))
+
+### Bug or Regression
+ - Add kubelet pod and csi plugin directories to mock driver manifest ([#308](https://github.com/kubernetes-csi/csi-test/pull/308), [@msau42](https://github.com/msau42))
+ - Log output from klog/v2 at higher log levels is now available ([#313](https://github.com/kubernetes-csi/csi-test/pull/313), [@pohly](https://github.com/pohly))
+ - Mock driver: fix formatting of error message for invalid starting token ([#322](https://github.com/kubernetes-csi/csi-test/pull/322), [@pohly](https://github.com/pohly))
+ - Updates the mock driver to create the target directory in `NodePublishVolume`, and remove it in `NodeUnpublishVolume`. ([#303](https://github.com/kubernetes-csi/csi-test/pull/303), [@huffmanca](https://github.com/huffmanca))
+
+### Other (Cleanup or Flake)
+ - Updated dependencies ([#315](https://github.com/kubernetes-csi/csi-test/pull/315), [@pohly](https://github.com/pohly))
+
+## Dependencies
+
+### Added
+- github.com/nxadm/tail: [v1.4.5](https://github.com/nxadm/tail/tree/v1.4.5)
+- golang.org/x/term: 7de9c90
+- golang.org/x/xerrors: 5ec99f8
+- google.golang.org/protobuf: v1.25.0
+- k8s.io/klog/v2: v2.4.0
+
+### Changed
+- github.com/cncf/udpa/go: [269d4d4 → efcf912](https://github.com/cncf/udpa/go/compare/269d4d4...efcf912)
+- github.com/envoyproxy/go-control-plane: [v0.9.4 → v0.9.7](https://github.com/envoyproxy/go-control-plane/compare/v0.9.4...v0.9.7)
+- github.com/fsnotify/fsnotify: [v1.4.7 → v1.4.9](https://github.com/fsnotify/fsnotify/compare/v1.4.7...v1.4.9)
+- github.com/go-logr/logr: [v0.1.0 → v0.3.0](https://github.com/go-logr/logr/compare/v0.1.0...v0.3.0)
+- github.com/golang/mock: [v1.3.1 → v1.4.4](https://github.com/golang/mock/compare/v1.3.1...v1.4.4)
+- github.com/golang/protobuf: [v1.3.3 → v1.4.3](https://github.com/golang/protobuf/compare/v1.3.3...v1.4.3)
+- github.com/google/go-cmp: [v0.2.0 → v0.5.0](https://github.com/google/go-cmp/compare/v0.2.0...v0.5.0)
+- github.com/google/uuid: [v1.1.1 → v1.1.2](https://github.com/google/uuid/compare/v1.1.1...v1.1.2)
+- github.com/onsi/ginkgo: [v1.10.3 → v1.14.2](https://github.com/onsi/ginkgo/compare/v1.10.3...v1.14.2)
+- github.com/onsi/gomega: [v1.7.1 → v1.10.4](https://github.com/onsi/gomega/compare/v1.7.1...v1.10.4)
+- github.com/robertkrimen/otto: [c382bd3 → ef014fd](https://github.com/robertkrimen/otto/compare/c382bd3...ef014fd)
+- github.com/sirupsen/logrus: [v1.4.2 → v1.7.0](https://github.com/sirupsen/logrus/compare/v1.4.2...v1.7.0)
+- github.com/stretchr/objx: [v0.1.1 → v0.1.0](https://github.com/stretchr/objx/compare/v0.1.1...v0.1.0)
+- github.com/stretchr/testify: [v1.2.2 → v1.5.1](https://github.com/stretchr/testify/compare/v1.2.2...v1.5.1)
+- golang.org/x/crypto: c2843e0 → 75b2880
+- golang.org/x/net: 2180aed → ac852fb
+- golang.org/x/sys: 4c7a9d0 → d4d67f9
+- golang.org/x/text: v0.3.2 → v0.3.4
+- google.golang.org/genproto: 6bbd007 → f927205
+- google.golang.org/grpc: v1.29.1 → v1.34.0
+- gopkg.in/yaml.v2: v2.2.5 → v2.4.0
+
+### Removed
+- github.com/konsorten/go-windows-terminal-sequences: [v1.0.2](https://github.com/konsorten/go-windows-terminal-sequences/tree/v1.0.2)
+- k8s.io/klog: v1.0.0

From 1337ff9dac1668c48a8c6a2aca6cfcf1e0008bf1 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Tue, 23 Feb 2021 20:23:41 +0100
Subject: [PATCH 2/2] docs: update for release v4.1.0

---
 README.md      | 11 ++++-------
 mock/README.md |  4 +++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 5ab8402f..77cfd439 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.org/kubernetes-csi/csi-test.svg?branch=master)](https://travis-ci.org/kubernetes-csi/csi-test)
-[![Docker Repository on Quay](https://quay.io/repository/k8scsi/mock-driver/status "Docker Repository on
-Quay")](https://quay.io/repository/k8scsi/mock-driver)
+[![Build Status](https://k8s-testgrid.appspot.com/sig-storage-csi-other#pull-kubernetes-csi-csi-test)](https://k8s-testgrid.appspot.com/sig-storage-csi-other#pull-kubernetes-csi-csi-test)
+[![Docker Repository on gcr](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/US/sig-storage/mock-driver)](https://console.cloud.google.com/gcr/images/k8s-artifacts-prod/US/sig-storage/mock-driver)
 
 # csi-test
 
@@ -14,9 +13,7 @@ CO developers can use this framework to create drivers based on the
 
 ### Mock driver for testing
 
-We also provide a container called `quay.io/k8scsi/mock-driver:canary` which can be used as an in-memory mock driver.
-It follows the same release cycle as other containers, so the latest release is `quay.io/k8scsi/mock-driver:v0.3.0`.
-
+We also provide a container called `k8s.gcr.io/sig-storage/mock-driver` which can be used as an in-memory mock driver.
 You will need to setup the environment variable `CSI_ENDPOINT` for the mock driver to know where to create the unix
 domain socket.
 
@@ -34,7 +31,7 @@ CSI driver.
 
 ### Note
 
-* Master is for CSI v1.2.0. Please see the branches for other CSI releases.
+* Master is for CSI v1.3.0. Please see the branches for other CSI releases.
 * Building has been tested with the Go version specified in release-tools/travis.yml
 
 ## Community, discussion, contribution, and support
diff --git a/mock/README.md b/mock/README.md
index 4176ad06..c5b79fd4 100644
--- a/mock/README.md
+++ b/mock/README.md
@@ -9,6 +9,8 @@ Usage of mock:
         Disables RPC_PUBLISH_UNPUBLISH_VOLUME capability.
   -name string
         CSI driver name. (default "io.kubernetes.storage.mock")
+  -v=5
+        Enable gRPC call logging.
 ```
 
 Limitation about this mock CSI Driver are:
@@ -57,4 +59,4 @@ Recommended steps to follow:
 1. Deploy `example/pvc-test.yaml` to test the provisioner. Edit the pvc spec to test csi volume resizer.
 2. Deploy `example/pod-test.yaml` to test volume mounting.
 3. Deploy `example/snapshot-test.yaml` to test snapshot of the pvc deployed in step 1.
-4. Deploy `example/snapshot-restore-test.yaml` to test restore volume from a snapshot generated from step 3s.
\ No newline at end of file
+4. Deploy `example/snapshot-restore-test.yaml` to test restore volume from a snapshot generated from step 3s.