Merge pull request kubernetes-csi#27 from dobsonj/rebase-v2.4.0

Bug 1993934: Update CSI sidecars

CHANGELOG/CHANGELOG-2.3.md

@@ -0,0 +1,42 @@
+# Release notes for v2.3.0
+
+[Documentation](https://kubernetes-csi.github.io/docs/)
+
+# Changelog since v2.2.0
+
+## Changes by Kind
+
+### Uncategorized
+ - Updated runtime (Go 1.16) and dependencies ([#107](https://github.com/kubernetes-csi/livenessprobe/pull/107), [@pohly](https://github.com/pohly))
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+- github.com/cncf/udpa/go: [efcf912 → 5459f2c](https://github.com/cncf/udpa/go/compare/efcf912...5459f2c)
+- github.com/container-storage-interface/spec: [v1.3.0 → v1.4.0](https://github.com/container-storage-interface/spec/compare/v1.3.0...v1.4.0)
+- github.com/envoyproxy/go-control-plane: [v0.9.7 → fd9021f](https://github.com/envoyproxy/go-control-plane/compare/v0.9.7...fd9021f)
+- github.com/go-logr/logr: [v0.3.0 → v0.4.0](https://github.com/go-logr/logr/compare/v0.3.0...v0.4.0)
+- github.com/golang/protobuf: [v1.4.3 → v1.5.1](https://github.com/golang/protobuf/compare/v1.4.3...v1.5.1)
+- github.com/google/go-cmp: [v0.5.2 → v0.5.5](https://github.com/google/go-cmp/compare/v0.5.2...v0.5.5)
+- github.com/kubernetes-csi/csi-lib-utils: [v0.9.0 → v0.9.1](https://github.com/kubernetes-csi/csi-lib-utils/compare/v0.9.0...v0.9.1)
+- github.com/prometheus/client_golang: [v1.8.0 → v1.9.0](https://github.com/prometheus/client_golang/compare/v1.8.0...v1.9.0)
+- github.com/prometheus/common: [v0.15.0 → v0.19.0](https://github.com/prometheus/common/compare/v0.15.0...v0.19.0)
+- github.com/prometheus/procfs: [v0.2.0 → v0.6.0](https://github.com/prometheus/procfs/compare/v0.2.0...v0.6.0)
+- golang.org/x/net: 986b41b → d523dce
+- golang.org/x/sync: cd5d95a → 09787c9
+- golang.org/x/sys: f9fddec → c4fcb01
+- golang.org/x/text: v0.3.4 → v0.3.5
+- google.golang.org/genproto: 8c77b98 → 75c7a85
+- google.golang.org/grpc: v1.34.0 → v1.36.0
+- google.golang.org/protobuf: v1.25.0 → v1.26.0
+- k8s.io/api: v0.20.0 → v0.20.4
+- k8s.io/apimachinery: v0.20.0 → v0.20.4
+- k8s.io/client-go: v0.20.0 → v0.20.4
+- k8s.io/component-base: v0.20.0 → v0.20.4
+- k8s.io/klog/v2: v2.4.0 → v2.8.0
+
+### Removed
+_Nothing has changed._

Dockerfile.Windows

@@ -1,12 +1,28 @@
-ARG BASE_IMAGE=servercore
-ARG BASE_IMAGE_TAG=1809
+# 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.
+
+# These arguments come from BUILD_PLATFORMS used in release-tools
+ARG ADDON_IMAGE=servercore:1809
+ARG BASE_IMAGE=nanoserver:1809
 ARG REGISTRY=mcr.microsoft.com/windows
 
-FROM ${REGISTRY}/${BASE_IMAGE}:${BASE_IMAGE_TAG} as core
-FROM mcr.microsoft.com/windows/nanoserver:${BASE_IMAGE_TAG}
+FROM ${REGISTRY}/${ADDON_IMAGE} as addon
+FROM ${REGISTRY}/${BASE_IMAGE}
 LABEL description="CSI Liveness Probe"
 
 COPY ./bin/livenessprobe.exe /livenessprobe.exe
-COPY --from=core /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
+COPY --from=addon /Windows/System32/netapi32.dll /Windows/System32/netapi32.dll
+
 USER ContainerAdministrator
 ENTRYPOINT ["/livenessprobe.exe"]

OWNERS

@@ -1,3 +1,5 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
 approvers:
 - openshift-storage-maintainers
 component: "Storage"

OWNERS_ALIASES

@@ -4,4 +4,4 @@ aliases:
     - tsmetana
     - gnufied
     - bertinatto
-    - huffmanca
+    - dobsonj

go.mod

@@ -1,19 +1,12 @@
 module github.com/kubernetes-csi/livenessprobe
 
-go 1.15
+go 1.16
 
 require (
-	github.com/container-storage-interface/spec v1.3.0
-	github.com/go-logr/logr v0.3.0 // indirect
+	github.com/container-storage-interface/spec v1.5.0
 	github.com/golang/mock v1.4.3
-	github.com/kubernetes-csi/csi-lib-utils v0.9.0
+	github.com/kubernetes-csi/csi-lib-utils v0.10.0
 	github.com/kubernetes-csi/csi-test/v4 v4.0.0-20200806214950-555d70a11a8b
-	github.com/prometheus/client_golang v1.8.0 // indirect
-	github.com/prometheus/common v0.15.0 // indirect
-	golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect
-	golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e // indirect
-	google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d // indirect
-	google.golang.org/grpc v1.34.0
-	k8s.io/component-base v0.20.0 // indirect
-	k8s.io/klog/v2 v2.4.0
+	google.golang.org/grpc v1.38.0
+	k8s.io/klog/v2 v2.9.0
 )