Skip to content

Commit

Permalink
Merge pull request kubernetes-csi#8 from jsafrane/rebase-v1.1.0
Browse files Browse the repository at this point in the history
Rebase v1.1.0
  • Loading branch information
openshift-merge-robot authored Jun 7, 2019
2 parents caa86a3 + 0413028 commit ea0d66c
Show file tree
Hide file tree
Showing 17,701 changed files with 101,990 additions and 4,759,237 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
40 changes: 40 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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
```
5 changes: 5 additions & 0 deletions .prow.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#! /bin/bash

. release-tools/prow.sh

main
23 changes: 23 additions & 0 deletions CHANGELOG-1.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Changelog since v1.0.1

## Deprecations
* Command line flag `--connection-timeout` is deprecated and has no effect.
* Command line flag `--snapshotter` is deprecated and has no effect ([#103](https://github.com/kubernetes-csi/external-snapshotter/pull/103))

## Notable Features
* Add Lease based Leader Election Support ([#107](https://github.com/kubernetes-csi/external-snapshotter/pull/107))
* The external snapshotter now tries to connect to the CSI driver indefinitely ([#92](https://github.com/kubernetes-csi/external-snapshotter/pull/92))
* A new --timeout parameter has been added for CSI operations ([#93](https://github.com/kubernetes-csi/external-snapshotter/pull/93))
* Prow testing ([#111](https://github.com/kubernetes-csi/external-snapshotter/pull/111))

## Other Notable Changes
* Add PR template ([#113](https://github.com/kubernetes-csi/external-snapshotter/pull/113))
* Un-prune code-generator scripts ([#110](https://github.com/kubernetes-csi/external-snapshotter/pull/110))
* Refactor external snapshotter to use csi-lib-utils/rpc ([#97](https://github.com/kubernetes-csi/external-snapshotter/pull/97))
* Fix for pre-bound snapshot empty source error ([#98](https://github.com/kubernetes-csi/external-snapshotter/pull/98))
* Update vendor to k8s 1.14.0 ([#105](https://github.com/kubernetes-csi/external-snapshotter/pull/105))
* Migrate to k8s.io/klog from glog. ([#88](https://github.com/kubernetes-csi/external-snapshotter/pull/88))
* Use distroless as base image ([#101](https://github.com/kubernetes-csi/external-snapshotter/pull/101))
* Remove constraints and update all vendor pkgs ([#100](https://github.com/kubernetes-csi/external-snapshotter/pull/100))
* Add dep prune options and remove unused packages ([#99](https://github.com/kubernetes-csi/external-snapshotter/pull/99))
* Release tools ([#86](https://github.com/kubernetes-csi/external-snapshotter/pull/86))
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine
FROM gcr.io/distroless/static:latest
LABEL maintainers="Kubernetes Authors"
LABEL description="CSI External Snapshotter"

Expand Down
10 changes: 10 additions & 0 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.11 AS builder
WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
COPY . .
RUN go build ./cmd/csi-snapshotter

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/csi-snapshotter /usr/bin/
RUN useradd csi-snapshotter
USER csi-snapshotter
ENTRYPOINT ["/usr/bin/csi-snapshotter"]
10 changes: 10 additions & 0 deletions Dockerfile.openshift.rhel7
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.11 AS builder
WORKDIR /go/src/github.com/kubernetes-csi/external-snapshotter
COPY . .
RUN go build ./cmd/csi-snapshotter

FROM registry.svc.ci.openshift.org/ocp/4.0:base
COPY --from=builder /go/src/github.com/kubernetes-csi/external-snapshotter/csi-snapshotter /usr/bin/
RUN useradd csi-snapshotter
USER csi-snapshotter
ENTRYPOINT ["/usr/bin/csi-snapshotter"]
Loading

0 comments on commit ea0d66c

Please sign in to comment.