Merge remote-tracking branch 'upstream/master' into jesse/20190828_merge

* upstream/master: (118 commits)
  restore: rename PV when remapping a namespace if PV exists in-cluster (vmware-tanzu#1779)
  when backing up PVCs with restic, explicitly specify --parent (vmware-tanzu#1807)
  Unit tests for restic restore (vmware-tanzu#1747)
  Upgrade kubernetes dependencies to 1.15.3 (vmware-tanzu#1808)
  create backups from schedules using velero create backup (vmware-tanzu#1734)
  remove calls to restic check before/after prune (vmware-tanzu#1794)
  Propose adding feature flags to velero
  restic backup and restore progress proposal (vmware-tanzu#1765)
  allow custom restic repo prefix to be specified in BSL config
  error if restic repo identifier can't be determined
  update nokogiri dep for website
  update links on website home page for latest release (vmware-tanzu#1789)
  Velero 1.1 blog post
  v1.1.0 changelog
  fix error formatting
  Revert "allow self signed certs with insecureSkipVerify (vmware-tanzu#1769)"
  allow self signed certs with insecureSkipVerify (vmware-tanzu#1769)
  v1.1.0 docs
  Add the prefix to BSL config map so that object stores can use it when initializing (vmware-tanzu#1767)
  add stable/velero to helm commands
  ...

.goreleaser.yml

@@ -25,28 +25,34 @@ builds:
       - amd64
       - arm
       - arm64
+      - ppc64le
     ignore:
       # don't build arm/arm64 for darwin or windows
       - goos: darwin
         goarch: arm
       - goos: darwin
         goarch: arm64
+      - goos: darwin
+        goarch: ppc64le
       - goos: windows
         goarch: arm
       - goos: windows
         goarch: arm64
+      - goos: windows
+        goarch: ppc64le
     ldflags:
       - -X "github.com/heptio/velero/pkg/buildinfo.Version={{ .Tag }}" -X "github.com/heptio/velero/pkg/buildinfo.GitSHA={{ .FullCommit }}" -X "github.com/heptio/velero/pkg/buildinfo.GitTreeState={{ .Env.GIT_TREE_STATE }}"
-archive:
-  name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
-  wrap_in_directory: true
-  files:
-    - LICENSE
-    - examples/**/*
+archives:
+  - name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
+    wrap_in_directory: true
+    files:
+      - LICENSE
+      - examples/**/*
 checksum:
   name_template: 'CHECKSUM'
 release:
   github:
     owner: heptio
     name: velero
   draft: true
+  prerelease: auto

CHANGELOG.md

@@ -1,10 +1,11 @@
 ## Current release:
-  * [CHANGELOG-1.0.md][10]
+  * [CHANGELOG-1.1.md][11]
 
 ## Development release:
   * [Unreleased Changes][0]
 
 ## Older releases:
+  * [CHANGELOG-1.0.md][10]
   * [CHANGELOG-0.11.md][9]
   * [CHANGELOG-0.10.md][8]
   * [CHANGELOG-0.9.md][7]
@@ -16,6 +17,7 @@
   * [CHANGELOG-0.3.md][1]
 
 
+[11]: https://github.com/heptio/velero/blob/master/changelogs/CHANGELOG-1.1.md
 [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

Dockerfile-fsfreeze-pause-ppc64le

@@ -0,0 +1,19 @@
+# Copyright 2019 the Velero contributors.
+#
+# 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.
+
+FROM ubuntu:bionic
+
+LABEL maintainer="Steve Kriss <[email protected]>"
+
+ENTRYPOINT ["/bin/bash", "-c", "while true; do sleep 10000; done"]

Dockerfile-velero-ppc64le

@@ -0,0 +1,32 @@
+# Copyright 2019 the Velero contributors.
+#
+# 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.
+
+FROM ubuntu:bionic
+
+LABEL maintainer="Steve Kriss <[email protected]>"
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends ca-certificates wget && \
+    wget --quiet https://oplab9.parqtec.unicamp.br/pub/ppc64el/restic/restic-0.9.4 && \
+    mv restic-0.9.4 /usr/bin/restic && \
+    chmod +x /usr/bin/restic && \
+    apt-get remove -y wget && \
+    rm -rf /var/lib/apt/lists/*
+
+
+ADD /bin/linux/ppc64le/velero /velero
+
+USER nobody:nobody
+
+ENTRYPOINT ["/velero"]

Dockerfile-velero-restic-restore-helper-ppc64le

@@ -0,0 +1,23 @@
+# Copyright 2019 the Velero contributors.
+#
+# 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.
+
+FROM ubuntu:bionic
+
+LABEL maintainer="Steve Kriss <[email protected]>"
+
+ADD /bin/linux/ppc64le/velero-restic-restore-helper .
+
+USER nobody:nobody
+
+ENTRYPOINT [ "/velero-restic-restore-helper" ]

Gopkg.toml

@@ -31,25 +31,25 @@
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  version = "~1.14"
+  version = "~1.15"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "kubernetes-1.14.0"
+  version = "kubernetes-1.15.3"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  version = "kubernetes-1.14.0"
+  version = "kubernetes-1.15.3"
 
 [[constraint]]
   name = "k8s.io/api"
-  version = "kubernetes-1.14.0"
+  version = "kubernetes-1.15.3"
 
 [[constraint]]
   name = "k8s.io/apiextensions-apiserver"
-  version = "kubernetes-1.14.0"
+  version = "kubernetes-1.15.3"
 
-# k8s.io/client-go kubernetes-1.14.0 uses v1.1.4
+# k8s.io/client-go kubernetes-1.15.3 uses v1.1.4
 [[override]]
   name = "github.com/json-iterator/go"
   version = "=1.1.4"
@@ -65,7 +65,7 @@
   name = "github.com/Azure/azure-sdk-for-go"
   version = "~21.4.0"
 
-# k8s.io/client-go kubernetes-1.14.0 uses v11.1.2
+# k8s.io/client-go kubernetes-1.15.3 uses v11.1.2
 [[constraint]]
   name = "github.com/Azure/go-autorest"
   version = "11.1.2"

README.md

@@ -7,8 +7,8 @@
 Velero (formerly Heptio Ark) gives you tools to back up and restore your Kubernetes cluster resources and persistent volumes. Velero lets you:
 
 * Take backups of your cluster and restore in case of loss.
-* Copy cluster resources to other clusters.
-* Replicate your production environment for development and testing environments.
+* Migrate cluster resources to other clusters.
+* Replicate your production cluster to development and testing clusters.
 
 Velero consists of:
 
@@ -19,8 +19,8 @@ You can run Velero in clusters on a cloud provider or on-premises. For detailed
 
 ## Installation
 
-We strongly recommend that you use an [official release][6] of Velero. The tarballs for each release contain the 
-`velero` command-line client. Follow the instructions under the **Install** section of [our documentation][29] to get started.
+We strongly recommend that you use an [official release][6] of Velero. The tarballs for each release contain the
+`velero` command-line client. Follow the [installation instructions][28] to get started.
 
 _The code and sample YAML files in the master branch of the Velero repository are under active development and are not guaranteed to be stable. Use them at your own risk!_
 
@@ -70,11 +70,11 @@ See [the list of releases][6] to find out about feature changes.
 
 [24]: https://groups.google.com/forum/#!forum/projectvelero
 [25]: https://kubernetes.slack.com/messages/velero
-[26]: https://velero.io/docs/v1.0.0/zenhub
+[26]: https://velero.io/docs/zenhub
 
+[28]: https://velero.io/docs/install-overview
+[29]: https://velero.io/docs/
+[30]: https://velero.io/docs/troubleshooting
 
-[29]: https://velero.io/docs/v1.0.0/
-[30]: https://velero.io/docs/v1.0.0/troubleshooting
-
-[99]: https://velero.io/docs/v1.0.0/support-matrix
+[99]: https://velero.io/docs/support-matrix
 [100]: /site/docs/master/img/velero.png