Merge tag 'v0.4.2' into bump-0.4.2

.travis.yml

@@ -10,8 +10,7 @@ script:
 - go vet $(go list ./... | grep -v vendor)
 - go test $(go list ./... | grep -v vendor)
 after_success:
-  - if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-      make container;
+  - if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
       docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" quay.io;
-      docker push quay.io/k8scsi/csi-provisioner:canary;
+      make push;
     fi

Gopkg.toml

@@ -63,3 +63,7 @@
 [[constraint]]
   name = "k8s.io/apiserver"
   version = "kubernetes-1.12.0"
+
+[[constraint]]
+  name = "github.com/kubernetes-csi/csi-lib-utils"
+  version = "0.2.0"

Makefile

@@ -14,7 +14,7 @@
 
 REGISTRY_NAME=quay.io/k8scsi
 IMAGE_NAME=csi-provisioner
-IMAGE_VERSION=canary
+IMAGE_VERSION=v0.4.1
 IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
 
 REV=$(shell git describe --long --tags --match='v*' --dirty)

pkg/controller/controller.go

@@ -29,6 +29,7 @@ import (
 	_ "k8s.io/apimachinery/pkg/util/json"
 
 	"github.com/golang/glog"
+	"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
 
 	"github.com/kubernetes-incubator/external-storage/lib/controller"
 
@@ -122,9 +123,9 @@ var (
 //TODO consolidate ane librarize
 func logGRPC(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
 	glog.V(5).Infof("GRPC call: %s", method)
-	glog.V(5).Infof("GRPC request: %+v", req)
+	glog.V(5).Infof("GRPC request: %s", protosanitizer.StripSecretsCSI03(req))
 	err := invoker(ctx, method, req, reply, cc, opts...)
-	glog.V(5).Infof("GRPC response: %+v", reply)
+	glog.V(5).Infof("GRPC response: %s", protosanitizer.StripSecretsCSI03(reply))
 	glog.V(5).Infof("GRPC error: %v", err)
 	return err
 }