Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into jesse/20190617
Browse files Browse the repository at this point in the history 
* upstream/master: (220 commits)
  Add restic instructions for Enterprise PKS (vmware-tanzu#1579)
  Adding Adnan to the team
  Discontinue use of excerpt separators in blog posts. (vmware-tanzu#1578)
  migrate PV snapshot tests
  migrate more backup action tests, remove obsolete test code (vmware-tanzu#1564)
  hide server commands in velero CLI (vmware-tanzu#1561)
  Fix test comparison
  remove glog (vmware-tanzu#1559)
  move issue-template-gen from docs/ to hack/ (vmware-tanzu#1558)
  update go-plugin to latest for bug fix (vmware-tanzu#1560)
  fix panic when processing DeleteBackupRequest objs without labels (vmware-tanzu#1556)
  Refactoring for backup item action tests (vmware-tanzu#1545)
  Support for multiple AWS profiles (vmware-tanzu#1548)
  add a link of velero plugin for alibabacloud to support-matrix docs
  fixes inlining of command in GCP setup docs (vmware-tanzu#1547)
  Signed-off-by: David Coons <coonsd@oregonstate.edu> (vmware-tanzu#1550)
  Add cmd to list plugins (vmware-tanzu#1535)
  Add ability to use wildcard in includes/excludes
  Initial pkg/backup test refactoring (vmware-tanzu#1532)
  Only run CI when relevant files have changed
  ...
  • Loading branch information
@jessestuart
jessestuart committed Jun 18, 2019
2 parents bbb76a2 + fac3cd4 commit 539bfa0
Show file tree
Hide file tree
Showing 1,669 changed files with 126,542 additions and 27,818 deletions.
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ about: Tell us about a problem you are experiencing

**Environment:**

<<<<<<< HEAD
- Velero version (use `velero version`):
=======
- Velero version (use `velero version`):
>>>>>>> upstream/master
- Kubernetes version (use `kubectl version`):
- Kubernetes installer & version:
- Cloud provider or hardware configuration:
Expand Down
9 changes: 8 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,14 @@ debug
.vscode
*.diff

_site/
# Jekyll compiled data
site/_site
site/.sass-cache
site/.jekyll
site/.jekyll-metadata
site/.bundle
site/vendor
.ruby-version

.vs

Expand Down
11 changes: 11 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
language: go

go:
- 1.12.x

sudo: required

services:
- docker

script: hack/ci-check.sh
8 changes: 5 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
## Current release:
* [CHANGELOG-1.0.md][10]

## Development release:
* [Unreleased Changes][0]

## Current release:
* [CHANGELOG-0.11.md][9]

## Older releases:
* [CHANGELOG-0.11.md][9]
* [CHANGELOG-0.10.md][8]
* [CHANGELOG-0.9.md][7]
* [CHANGELOG-0.8.md][6]
Expand All @@ -15,6 +16,7 @@
* [CHANGELOG-0.3.md][1]


[10]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-1.0.md
[9]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.11.md
[8]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.10.md
[7]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-0.9.md
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-fsfreeze-pause
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM debian:stretch-slim
FROM ubuntu:bionic

LABEL maintainer="Steve Kriss <krisss@vmware.com>"

Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-velero
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM debian:stretch-slim
FROM ubuntu:bionic

LABEL maintainer="Steve Kriss <krisss@vmware.com>"

Expand All @@ -25,7 +25,6 @@ RUN apt-get update && \
apt-get remove -y wget bzip2 && \
rm -rf /var/lib/apt/lists/*


ADD /bin/linux/amd64/velero /velero

USER nobody:nobody
Expand Down
28 changes: 4 additions & 24 deletions Dockerfile-velero-restic-restore-helper
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG target
FROM ubuntu:bionic

FROM golang:1.12 as builder
LABEL maintainer="Steve Kriss <krisss@vmware.com>"

ARG goarch
ENV GOOS linux
ENV GOARCH $goarch
ENV GOPATH /go
ENV CGO_ENABLED 0
ENV PATH "$GOPATH/bin:$PATH"
ENV GIT_TERMINAL_PROMPT 1

LABEL maintainer="Jesse Stuart <hi@jessestuart.com>"

ENV image heptio/velero
WORKDIR /go/src/github.com/${image}
RUN git clone https://github.com/${image} . && \
go build cmd/velero-restic-restore-helper/main.go && \
mv ./main /velero-restic-restore-helper

FROM $target/alpine

COPY qemu-* /usr/bin/

COPY --from=builder /velero-restic-restore-helper /velero-restic-restore-helper
ADD /bin/linux/amd64/velero-restic-restore-helper .

USER nobody:nobody

ENTRYPOINT ["/velero-restic-restore-helper"]
ENTRYPOINT [ "/velero-restic-restore-helper" ]
Loading

0 comments on commit 539bfa0

Please sign in to comment.