Rebase to 1.2.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+<!--  Thanks for sending a pull request!  Here are some tips for you:
+
+1. If this is your first time, please read our contributor guidelines: https://git.k8s.io/community/contributors/guide#your-first-contribution and developer guide https://git.k8s.io/community/contributors/devel/development.md#development-guide
+2. Follow the instructions for writing a release note: https://git.k8s.io/community/contributors/guide/release-notes.md
+3. If the PR is unfinished, see how to mark it: https://git.k8s.io/community/contributors/guide/pull-requests.md#marking-unfinished-pull-requests
+-->
+
+**What type of PR is this?**
+> Uncomment only one ` /kind <>` line, hit enter to put that in a new line, and remove leading whitespaces from that line:
+>
+> /kind api-change
+> /kind bug
+> /kind cleanup
+> /kind design
+> /kind documentation
+> /kind failing-test
+> /kind feature
+> /kind flake
+
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR fixes**:
+<!--
+*Automatically closes linked issue when PR is merged.
+Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
+_If PR is about `failing-tests or flakes`, please post the related issues/tests in a comment and do not use `Fixes`_*
+-->
+Fixes #
+
+**Special notes for your reviewer**:
+
+**Does this PR introduce a user-facing change?**:
+<!--
+If no, just write "NONE" in the release-note block below.
+If yes, a release note is required:
+Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
+-->
+```release-note
+
+```

CHANGELOG-1.2.md

@@ -0,0 +1,7 @@
+# Changelog since v1.1.0
+
+## New Features
+
+- Support Node Driver Registrar on Windows nodes. Note Windows container images are not published and need to be manually built. ([#47](https://github.com/kubernetes-csi/node-driver-registrar/pull/47), [@ddebroy](https://github.com/ddebroy))
+
+

Dockerfile.Windows

@@ -0,0 +1,9 @@
+FROM mcr.microsoft.com/windows/servercore:1809 as core
+
+FROM mcr.microsoft.com/windows/nanoserver:1809
+LABEL description="CSI Node driver registrar"
+
+COPY ./bin/csi-node-driver-registrar.exe /csi-node-driver-registrar.exe
+COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
+USER ContainerAdministrator
+ENTRYPOINT ["/csi-node-driver-registrar.exe"]

Dockerfile.openshift

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/node-driver-registrar
 COPY . .
 RUN make build

Dockerfile.openshift.rhel7

@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/node-driver-registrar
 COPY . .
 RUN make build

README.md

@@ -19,7 +19,7 @@ This information reflects the head of this branch.
 | ------------------------------------------------------------------------------------------ | ----------------------------------------------- | --------------- |
 | [CSI Spec v1.0.0](https://github.com/container-storage-interface/spec/releases/tag/v1.0.0) | quay.io/k8scsi/csi-node-driver-registrar        | 1.13            |
 
-For release-0.4 and below, please refer to the [node-registrar
+For release-0.4 and below, please refer to the [driver-registrar
 repository](https://github.com/kubernetes-csi/driver-registrar).
 
 ## Usage

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

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"runtime"
 
 	"google.golang.org/grpc"
 
-	"golang.org/x/sys/unix"
 	"k8s.io/klog"
 	registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1"
 )
@@ -48,16 +48,22 @@ func nodeRegister(
 		klog.Errorf("failed to stat the socket %s with error: %+v", socketPath, err)
 		os.Exit(1)
 	}
-	// Default to only user accessible socket, caller can open up later if desired
-	oldmask := unix.Umask(0077)
+
+	var oldmask int
+	if runtime.GOOS == "linux" {
+		// Default to only user accessible socket, caller can open up later if desired
+		oldmask, _ = umask(0077)
+	}
 
 	klog.Infof("Starting Registration Server at: %s\n", socketPath)
 	lis, err := net.Listen("unix", socketPath)
 	if err != nil {
 		klog.Errorf("failed to listen on socket: %s with error: %+v", socketPath, err)
 		os.Exit(1)
 	}
-	unix.Umask(oldmask)
+	if runtime.GOOS == "linux" {
+		umask(oldmask)
+	}
 	klog.Infof("Registration Server started at: %s\n", socketPath)
 	grpcServer := grpc.NewServer()
 	// Registers kubelet plugin watcher api.

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

@@ -0,0 +1,27 @@
+// +build linux
+
+/*
+Copyright 2019 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.
+*/
+
+package main
+
+import (
+	"golang.org/x/sys/unix"
+)
+
+func umask(mask int) (int, error) {
+	return unix.Umask(mask), nil
+}

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

@@ -0,0 +1,27 @@
+// +build windows
+
+/*
+Copyright 2019 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.
+*/
+
+package main
+
+import (
+	"errors"
+)
+
+func umask(mask int) (int, error) {
+	return -1, errors.New("umask not supported in Windows")
+}

release-tools/build.make

@@ -63,6 +63,7 @@ endif
 build-%:
 	mkdir -p bin
 	CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/$* ./cmd/$*
+	CGO_ENABLED=0 GOOS=windows go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/$*.exe ./cmd/$*
 
 container-%: build-%
 	docker build -t $*:latest -f $(shell if [ -e ./cmd/$*/Dockerfile ]; then echo ./cmd/$*/Dockerfile; else echo Dockerfile; fi) --label revision=$(REV) .
@@ -118,14 +119,39 @@ test-fmt:
 	fi
 
 # This test only runs when dep >= 0.5 is installed, which is the case for the CI setup.
+# When using 'go mod', we allow the test to be skipped in the Prow CI under some special
+# circumstances, because it depends on accessing all remote repos and thus
+# running it all the time would defeat the purpose of vendoring:
+# - not handling a PR or
+# - the fabricated merge commit leaves go.mod, go.sum and vendor dir unchanged
+# - release-tools also didn't change (changing rules or Go version might lead to
+#   a different result and thus must be tested)
 .PHONY: test-vendor
 test: test-vendor
 test-vendor:
 	@ echo; echo "### $@:"
-	@ case "$$(dep version 2>/dev/null | grep 'version *:')" in \
-		*v0.[56789]*) dep check && echo "vendor up-to-date" || false;; \
-		*) echo "skipping check, dep >= 0.5 required";; \
-	esac
+	@ if [ -f Gopkg.toml ]; then \
+		echo "Repo uses 'dep' for vendoring."; \
+		case "$$(dep version 2>/dev/null | grep 'version *:')" in \
+			*v0.[56789]*) dep check && echo "vendor up-to-date" || false;; \
+			*) echo "skipping check, dep >= 0.5 required";; \
+		esac; \
+	  else \
+		echo "Repo uses 'go mod' for vendoring."; \
+		if [ "$${JOB_NAME}" ] && \
+                   ( [ "$${JOB_TYPE}" != "presubmit" ] || \
+                     [ $$(git diff "${PULL_BASE_SHA}..HEAD" -- go.mod go.sum vendor release-tools | wc -l) -eq 0 ] ); then \
+			echo "Skipping vendor check because the Prow pre-submit job does not change vendoring."; \
+		elif ! GO111MODULE=on go mod vendor; then \
+			echo "ERROR: vendor check failed."; \
+			false; \
+		elif [ $$(git status --porcelain -- vendor | wc -l) -gt 0 ]; then \
+			echo "ERROR: vendor directory *not* up-to-date, it did get modified by 'GO111MODULE=on go mod vendor':"; \
+			git status -- vendor; \
+			git diff -- vendor; \
+			false; \
+		fi; \
+	 fi;
 
 .PHONY: test-subtree
 test: test-subtree