master: update release-tools

.prow.sh

@@ -1,4 +1,17 @@
 #! /bin/bash -e
+# Copyright 2021 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # A Prow job can override these defaults, but this shouldn't be necessary.
 

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

CHANGELOG/CHANGELOG-4.2.md

@@ -0,0 +1,30 @@
+# Release notes for v4.2.0
+
+*Note:* The mock driver is deprecated and will be removed in the next
+release. It gets replaced by the
+[csi-driver-host-path](https://github.com/kubernetes-csi/csi-driver-host-path/). Error
+injection via JavaScript gets replaced with proxying CSI requests and
+[Go callbacks inside E2E
+tests](https://github.com/kubernetes/kubernetes/blob/5ad79eae2dcbf33df3b35c48ec993d30fbda46dd/test/e2e/storage/csi_mock_volume.go#L110).
+
+# Changelog since v4.1.0
+
+## Changes by Kind
+
+### Enhancements
+ - Removal of the CSI nodepublish path by the kubelet is deprecated. This must be done by the CSI plugin according to the CSI spec. ([#338](https://github.com/kubernetes-csi/csi-test/pull/338), [@dobsonj](https://github.com/dobsonj))
+ - Better error messages in csi-sanity when encountering unexpected gRPC status codes. ([#334](https://github.com/kubernetes-csi/csi-test/pull/334), [@avorima](https://github.com/avorima))
+
+### Uncategorized
+ - Updated runtime (Go 1.16) and dependencies ([#330](https://github.com/kubernetes-csi/csi-test/pull/330), [@pohly](https://github.com/pohly))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+_Nothing has changed._
+
+### Removed
+_Nothing has changed._

CHANGELOG/CHANGELOG-4.3.md

@@ -0,0 +1,26 @@
+# Release notes for v4.3.0
+
+# Changelog since v4.2.0
+
+## Changes by Kind
+
+### Failing Test
+ - Avoid test failures when a CSI driver advertises the `VOLUME_MOUNT_GROUP` capability from CSI 1.5 ([#349](https://github.com/kubernetes-csi/csi-test/pull/349), [@andyzhangx](https://github.com/andyzhangx))
+ - Avoid test failures when a CSI driver advertises the `SINGLE_NODE_MULTI_WRITER` capability from CSI 1.5 ([#342](https://github.com/kubernetes-csi/csi-test/pull/342), [@chrishenzie](https://github.com/chrishenzie))
+
+### Other (Cleanup or Flake)
+ - The mock driver gets removed. https://github.com/kubernetes-csi/csi-driver-host-path should be used instead. ([#351](https://github.com/kubernetes-csi/csi-test/pull/351), [@pohly](https://github.com/pohly))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- github.com/container-storage-interface/spec: [v1.3.0 → v1.5.0](https://github.com/container-storage-interface/spec/compare/v1.3.0...v1.5.0)
+- github.com/davecgh/go-spew: [v1.1.1 → v1.1.0](https://github.com/davecgh/go-spew/compare/v1.1.1...v1.1.0)
+
+### Removed
+- github.com/robertkrimen/otto: [ef014fd](https://github.com/robertkrimen/otto/tree/ef014fd)
+- github.com/sirupsen/logrus: [v1.7.0](https://github.com/sirupsen/logrus/tree/v1.7.0)
+- gopkg.in/sourcemap.v1: v1.0.5

CONTRIBUTING.md

@@ -10,7 +10,7 @@ We have full documentation on how to get started contributing here:
 
 - [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests
 - [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](http://git.k8s.io/community/contributors/guide#contributing)
-- [Contributor Cheat Sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet.md) - Common resources for existing developers
+- [Contributor Cheat Sheet](https://github.com/kubernetes/community/blob/master/contributors/guide/contributor-cheatsheet/README.md) - Common resources for existing developers
 
 ## Mentorship
 

Makefile

@@ -12,23 +12,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This repository builds two commands, mock-driver and csi-sanity,
-# but csi-sanity has its own build rules and only mock-driver gets
-# published as a container image.
-CMDS=mock-driver
+# This repository builds one command, csi-sanity, but it has its own build
+# rules no image to be published.
+CMDS=
 all: build build-sanity
 
 include release-tools/build.make
 
 # We have to exclude generic testing of the csi-sanity command because
 # the test binary only works in combination with a CSI driver.
-# Instead we test with the special ./hack/e2e.sh.
+# Instead we test with the special ./hack/e2e.sh and the
+# csi-driver-host-path that we build from source.
 TEST_GO_FILTER_CMD+=| grep -v /cmd/csi-sanity
 .PHONY: test-sanity
 test: test-sanity
-test-sanity:
+test-sanity: bin/hostpathplugin
 	@ echo; echo "### $@:"
-	./hack/e2e.sh
+	if [ $$(id -u) = 0 ]; then \
+		./hack/e2e.sh; \
+	else \
+		sudo ./hack/e2e.sh; \
+	fi
 
 build-sanity:
 	$(MAKE) -C cmd/csi-sanity all
+
+
+TEST_HOSTPATH_VERSION=v1.7.3
+TEST_HOSTPATH_SOURCE=bin/hostpath-source
+TEST_HOSTPATH_REPO=https://github.com/kubernetes-csi/csi-driver-host-path.git
+bin/hostpathplugin:
+	mkdir -p $(@D)
+	if ! [ -d $(TEST_HOSTPATH_SOURCE) ]; then \
+		mkdir -p $(dir $(TEST_HOSTPATH_SOURCE)) && \
+		git clone $(TEST_HOSTPATH_REPO) $(TEST_HOSTPATH_SOURCE); \
+	fi
+	cd $(TEST_HOSTPATH_SOURCE) && git checkout $(TEST_HOSTPATH_VERSION)
+	make -C $(TEST_HOSTPATH_SOURCE) build
+	ln -fs $(abspath $(TEST_HOSTPATH_SOURCE))/bin/hostpathplugin $@

OWNERS

@@ -1,6 +1,6 @@
 approvers:
-- saad-ali
-- lpabon
+- kubernetes-csi-approvers
 - pohly
-- msau42
-- jsafrane
+
+reviewers:
+- kubernetes-csi-reviewers

OWNERS_ALIASES

@@ -0,0 +1 @@
+release-tools/KUBERNETES_CSI_OWNERS_ALIASES

README.md

@@ -1,6 +1,4 @@
-[![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)
 
 # csi-test
 
@@ -12,19 +10,6 @@ CO developers can use this framework to create drivers based on the
 [Golang mock](https://github.com/golang/mock) framework. Please see
 [co_test.go](test/co_test.go) for an example.
 
-### 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`.
-
-You will need to setup the environment variable `CSI_ENDPOINT` for the mock driver to know where to create the unix
-domain socket.
-
-There is an [example](https://github.com/kubernetes-csi/csi-test/tree/master/mock/example) deployment
-for experiment with the mock csi driver.
-
-For more complicated test-cases see [how to use JavaScript hooks from the driver](hooks-howto.md).
-
 ## For CSI Driver Tests
 
 To test drivers please take a look at [pkg/sanity](https://github.com/kubernetes-csi/csi-test/tree/master/pkg/sanity).
@@ -34,7 +19,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

cmd/csi-sanity/Makefile

@@ -1,3 +1,17 @@
+# Copyright 2021 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 APP_NAME := csi-sanity
 VER :=$(shell git describe)
 RELEASEVER := $(shell git describe --abbrev=0)

cmd/csi-sanity/main.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2017 Luis Pabón luis@portworx.com
+Copyright 2021 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -22,6 +22,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/onsi/ginkgo"
+	"k8s.io/klog/v2"
+
 	"github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
 )
 
@@ -78,6 +81,8 @@ func main() {
 	stringVar(&config.RemoveTargetPathCmd, "removemountpathcmd", "Command to run for target path removal")
 	stringVar(&config.RemoveStagingPathCmd, "removestagingpathcmd", "Command to run for staging path removal")
 	durationVar(&config.RemovePathCmdTimeout, "removepathcmdtimeout", "Timeout for the commands to remove target and staging paths, in seconds")
+	stringVar(&config.CheckPathCmd, "checkpathcmd", "Command to run to check a given path. It must print 'file', 'directory', 'not_found', or 'other' on stdout.")
+	durationVar(&config.CheckPathCmdTimeout, "checkpathcmdtimeout", "Timeout for the command to check a given path, in seconds")
 	stringVar(&config.SecretsFile, "secrets", "CSI secrets file")
 	stringVar(&config.TestVolumeAccessType, "testvolumeaccesstype", "Volume capability access type, valid values are mount or block")
 	int64Var(&config.TestVolumeSize, "testvolumesize", "Base volume size used for provisioned volumes")
@@ -101,6 +106,7 @@ func main() {
 		os.Exit(1)
 	}
 
+	klog.SetOutput(ginkgo.GinkgoWriter)
 	t := testing{}
 	sanity.Test(&t, config)
 	os.Exit(t.result)