Rebase to v1.3.0

CHANGELOG-1.3.md

@@ -0,0 +1,12 @@
+# Changelog since v1.2.0
+
+## Bug Fixes
+
+- Fix registration socket cleanup on Windows during startup([#64](https://github.com/kubernetes-csi/node-driver-registrar/pull/64), [@kkmsft](https://github.com/kkmsft))
+
+
+## Other Notable Changes
+
+- Migrated to Go modules, so the source builds also outside of GOPATH. ([#52](https://github.com/kubernetes-csi/node-driver-registrar/pull/52), [@pohly](https://github.com/pohly))
+
+

Dockerfile.multiarch

@@ -0,0 +1,14 @@
+FROM --platform=$BUILDPLATFORM golang:1.13.3 AS builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+WORKDIR /code
+ADD . /code/
+
+RUN cd /code/ && GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') make build
+
+FROM gcr.io/distroless/static:latest
+LABEL maintainers="Kubernetes Authors"
+LABEL description="CSI Node driver registrar"
+
+COPY --from=builder /code/bin/csi-node-driver-registrar csi-node-driver-registrar
+ENTRYPOINT ["/csi-node-driver-registrar"]

README.md

@@ -36,9 +36,9 @@ There are two UNIX domain sockets used by the node-driver-registrar:
 * CSI driver socket:
   * Used by kubelet to interact with the CSI driver.
   * Created by the CSI driver.
-  * Exposed on a Kubernetes node via hostpath somewhere other than the Kubelet.
-    plugin registry (typically `/var/lib/kubelet/plugins/<drivername.example.com>/csi.sock`).
+  * Exposed on a Kubernetes node via hostpath somewhere other than the Kubelet plugin registry. (typically `/var/lib/kubelet/plugins/<drivername.example.com>/csi.sock`).
   * This is the socket referenced by the `--csi-address` and `--kubelet-registration-path` arguments.
+  * Note that before Kubernetes v1.17, if the csi socket is in the `/var/lib/kubelet/plugins/` path, kubelet may log a lot of harmless errors regarding grpc `GetInfo` call not implemented (fix in kubernetes/kubernetes#84533). The `/var/lib/kubelet/csi-plugins/` path is preferred in Kubernetes versions prior to v1.17.
 
 ### Required arguments
 

cloudbuild.yaml

@@ -0,0 +1,28 @@
+# See https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md for more details on image pushing process
+
+# this must be specified in seconds. If omitted, defaults to 600s (10 mins)
+timeout: 1200s
+# this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
+# or any new substitutions added in the future.
+options:
+  substitution_option: ALLOW_LOOSE
+steps:
+  - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4'
+    entrypoint: 'bash'
+    env:
+    - DOCKER_CLI_EXPERIMENTAL=enabled
+    - VERSION=$_GIT_TAG
+    - BASE_REF=$_PULL_BASE_REF
+    args:
+    - '-c'
+    - |
+      docker buildx create --use --name multiarchimage-builder \
+      && docker buildx build --push -t gcr.io/k8s-staging-csi/csi-node-driver-registrar:latest --platform=linux/amd64,linux/s390x -f Dockerfile.multiarch .
+substitutions:
+  # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
+  # can be used as a substitution
+  _GIT_TAG: '12345'
+  # _PULL_BASE_REF will contain the ref that was pushed to to trigger this build -
+  # a branch like 'master' or 'release-0.2', or a tag like 'v0.2'.
+  _PULL_BASE_REF: 'master'
+

cmd/csi-node-driver-registrar/node_register.go

@@ -24,6 +24,7 @@ import (
 
 	"google.golang.org/grpc"
 
+	"github.com/kubernetes-csi/node-driver-registrar/pkg/util"
 	"k8s.io/klog"
 	registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1"
 )
@@ -36,23 +37,15 @@ func nodeRegister(
 	// pluginswatcher infrastructure. Node labeling is done by kubelet's csi code.
 	registrar := newRegistrationServer(csiDriverName, *kubeletRegistrationPath, supportedVersions)
 	socketPath := fmt.Sprintf("/registration/%s-reg.sock", csiDriverName)
-	fi, err := os.Stat(socketPath)
-	if err == nil && (fi.Mode()&os.ModeSocket) != 0 {
-		// Remove any socket, stale or not, but fall through for other files
-		if err := os.Remove(socketPath); err != nil {
-			klog.Errorf("failed to remove stale socket %s with error: %+v", socketPath, err)
-			os.Exit(1)
-		}
-	}
-	if err != nil && !os.IsNotExist(err) {
-		klog.Errorf("failed to stat the socket %s with error: %+v", socketPath, err)
+	if err := util.CleanupSocketFile(socketPath); err != nil {
+		klog.Errorf("%+v", err)
 		os.Exit(1)
 	}
 
 	var oldmask int
 	if runtime.GOOS == "linux" {
 		// Default to only user accessible socket, caller can open up later if desired
-		oldmask, _ = umask(0077)
+		oldmask, _ = util.Umask(0077)
 	}
 
 	klog.Infof("Starting Registration Server at: %s\n", socketPath)
@@ -62,7 +55,7 @@ func nodeRegister(
 		os.Exit(1)
 	}
 	if runtime.GOOS == "linux" {
-		umask(oldmask)
+		util.Umask(oldmask)
 	}
 	klog.Infof("Registration Server started at: %s\n", socketPath)
 	grpcServer := grpc.NewServer()

go.mod

@@ -0,0 +1,21 @@
+module github.com/kubernetes-csi/node-driver-registrar
+
+go 1.12
+
+require (
+	github.com/container-storage-interface/spec v1.0.0 // indirect
+	github.com/gogo/protobuf v1.0.0 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/protobuf v1.1.0 // indirect
+	github.com/kubernetes-csi/csi-lib-utils v0.4.0-rc1
+	github.com/stretchr/testify v1.4.0 // indirect
+	golang.org/x/net v0.0.0-20180301190904-22ae77b79946 // indirect
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
+	golang.org/x/sys v0.0.0-20180302081741-dd2ff4accc09
+	golang.org/x/text v0.3.0 // indirect
+	google.golang.org/genproto v0.0.0-20180301225018-2c5e7ac708aa // indirect
+	google.golang.org/grpc v1.10.0
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/klog v0.1.0
+	k8s.io/kubernetes v1.11.0-beta.2
+)