Merge pull request kubernetes-csi#7 from jsafrane/rebase-v0.4.0

Rebase to v0.4.0
jsafrane · Jan 8, 2020 · 2c57909 · 2c57909
2 parents c80a2ba + db6762f
commit 2c57909
Show file tree

Hide file tree

Showing 1,208 changed files with 263,896 additions and 195,996 deletions.
diff --git a/.prow.sh b/.prow.sh
@@ -1,6 +1,4 @@
 #! /bin/bash
 
-CSI_PROW_KUBERNETES_VERSION=latest
-CSI_PROW_E2E_VERSION=master
 . release-tools/prow.sh
 main
diff --git a/CHANGELOG-0.4.md b/CHANGELOG-0.4.md
@@ -0,0 +1,9 @@
+# Changelog since v0.3.0
+
+## New Features
+
+- Add prometheus metrics to CSI external-resizer under the /metrics endpoint. This can be enabled via the "--metrics-address" and "--metrics-path" options. ([#67](https://github.com/kubernetes-csi/external-resizer/pull/67), [@saad-ali](https://github.com/saad-ali))
+
+## Other Notable Changes
+
+- Migrated to Go modules, so the source builds also outside of GOPATH. ([#60](https://github.com/kubernetes-csi/external-resizer/pull/60), [@pohly](https://github.com/pohly))
diff --git a/Dockerfile.openshift b/Dockerfile.openshift
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/openshift/release:golang-1.12 AS builder
+FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-resizer
 COPY . .
 RUN make build

diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7
@@ -1,4 +1,4 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.12 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
 WORKDIR /go/src/github.com/kubernetes-csi/external-resizer
 COPY . .
 RUN make build