mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-07-31 04:22:44 +00:00
update gcr.io/heptio-images/ references to velero/ (#1988)
* update gcr.io/heptio-images/ references to velero/ Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>
This commit is contained in:
committed by
KubeKween
parent
4b91a97ff7
commit
69f993aebd
@@ -70,7 +70,7 @@ spec:
|
||||
- mountPath: "/var/log/nginx"
|
||||
name: nginx-logs
|
||||
readOnly: false
|
||||
- image: gcr.io/heptio-images/fsfreeze-pause:latest
|
||||
- image: velero/fsfreeze-pause:latest
|
||||
name: fsfreeze
|
||||
securityContext:
|
||||
privileged: true
|
||||
|
||||
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
func DaemonSet(namespace string, opts ...podTemplateOption) *appsv1.DaemonSet {
|
||||
c := &podTemplateConfig{
|
||||
image: "gcr.io/heptio-images/velero:latest",
|
||||
image: DefaultImage,
|
||||
}
|
||||
|
||||
for _, opt := range opts {
|
||||
|
||||
@@ -29,8 +29,8 @@ func TestDaemonSet(t *testing.T) {
|
||||
assert.Equal(t, "restic", ds.Spec.Template.Spec.Containers[0].Name)
|
||||
assert.Equal(t, "velero", ds.ObjectMeta.Namespace)
|
||||
|
||||
ds = DaemonSet("velero", WithImage("gcr.io/heptio-images/velero:v0.11"))
|
||||
assert.Equal(t, "gcr.io/heptio-images/velero:v0.11", ds.Spec.Template.Spec.Containers[0].Image)
|
||||
ds = DaemonSet("velero", WithImage("velero/velero:v0.11"))
|
||||
assert.Equal(t, "velero/velero:v0.11", ds.Spec.Template.Spec.Containers[0].Image)
|
||||
assert.Equal(t, corev1.PullIfNotPresent, ds.Spec.Template.Spec.Containers[0].ImagePullPolicy)
|
||||
|
||||
ds = DaemonSet("velero", WithSecret(true))
|
||||
|
||||
@@ -38,8 +38,8 @@ func TestDeployment(t *testing.T) {
|
||||
assert.Equal(t, "my-secret", envSecret.ValueFrom.SecretKeyRef.LocalObjectReference.Name)
|
||||
assert.Equal(t, "my-key", envSecret.ValueFrom.SecretKeyRef.Key)
|
||||
|
||||
deploy = Deployment("velero", WithImage("gcr.io/heptio-images/velero:v0.11"))
|
||||
assert.Equal(t, "gcr.io/heptio-images/velero:v0.11", deploy.Spec.Template.Spec.Containers[0].Image)
|
||||
deploy = Deployment("velero", WithImage("velero/velero:v0.11"))
|
||||
assert.Equal(t, "velero/velero:v0.11", deploy.Spec.Template.Spec.Containers[0].Image)
|
||||
assert.Equal(t, corev1.PullIfNotPresent, deploy.Spec.Template.Spec.Containers[0].ImagePullPolicy)
|
||||
|
||||
deploy = Deployment("velero", WithSecret(true))
|
||||
|
||||
@@ -41,7 +41,7 @@ func imageVersion() string {
|
||||
|
||||
// DefaultImage is the default image to use for the Velero deployment and restic daemonset containers.
|
||||
var (
|
||||
DefaultImage = "gcr.io/heptio-images/velero:" + imageVersion()
|
||||
DefaultImage = "velero/velero:" + imageVersion()
|
||||
DefaultVeleroPodCPURequest = "500m"
|
||||
DefaultVeleroPodMemRequest = "128Mi"
|
||||
DefaultVeleroPodCPULimit = "1000m"
|
||||
|
||||
@@ -39,7 +39,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
defaultImageBase = "gcr.io/heptio-images/velero-restic-restore-helper"
|
||||
defaultImageBase = "velero/velero-restic-restore-helper"
|
||||
defaultCPURequestLimit = "100m"
|
||||
defaultMemRequestLimit = "128Mi"
|
||||
)
|
||||
|
||||
@@ -4,18 +4,18 @@ This document describes Velero's image tagging policy.
|
||||
|
||||
## Released versions
|
||||
|
||||
`gcr.io/heptio-images/velero:<SemVer>`
|
||||
`velero/velero:<SemVer>`
|
||||
|
||||
Velero follows the [Semantic Versioning](http://semver.org/) standard for releases. Each tag in the `github.com/vmware-tanzu/velero` repository has a matching image, e.g. `gcr.io/heptio-images/velero:v1.0.0`.
|
||||
Velero follows the [Semantic Versioning](http://semver.org/) standard for releases. Each tag in the `github.com/vmware-tanzu/velero` repository has a matching image, e.g. `velero/velero:v1.0.0`.
|
||||
|
||||
### Latest
|
||||
|
||||
`gcr.io/heptio-images/velero:latest`
|
||||
`velero/velero:latest`
|
||||
|
||||
The `latest` tag follows the most recently released version of Velero.
|
||||
|
||||
## Development
|
||||
|
||||
`gcr.io/heptio-images/velero:master`
|
||||
`velero/velero:master`
|
||||
|
||||
The `master` tag follows the latest commit to land on the `master` branch.
|
||||
|
||||
@@ -1,82 +0,0 @@
|
||||
# Migrating from Heptio Ark to Velero
|
||||
|
||||
As of v0.11.0, Heptio Ark has become Velero. This means the following changes have been made:
|
||||
|
||||
* The `ark` CLI client is now `velero`.
|
||||
* The default Kubernetes namespace and ServiceAccount are now named `velero` (formerly `heptio-ark`).
|
||||
* The container image name is now `gcr.io/heptio-images/velero` (formerly `gcr.io/heptio-images/ark`).
|
||||
* CRDs are now under the new `velero.io` API group name (formerly `ark.heptio.com`).
|
||||
|
||||
|
||||
The following instructions will help you migrate your existing Ark installation to Velero.
|
||||
|
||||
# Prerequisites
|
||||
|
||||
* Ark v0.10.x installed. See the v0.10.x [upgrade instructions][1] to upgrade from older versions.
|
||||
* `kubectl` installed.
|
||||
* `cluster-admin` permissions.
|
||||
|
||||
# Migration process
|
||||
|
||||
At a high level, the migration process involves the following steps:
|
||||
|
||||
* Scale down the `ark` deployment, so it will not process schedules, backups, or restores during the migration period.
|
||||
* Create a new namespace (named `velero` by default).
|
||||
* Apply the new CRDs.
|
||||
* Migrate existing Ark CRD objects, labels, and annotations to the new Velero equivalents.
|
||||
* Recreate the existing cloud credentials secret(s) in the velero namespace.
|
||||
* Apply the updated Kubernetes deployment and daemonset (for restic support) to use the new container images and namespace.
|
||||
* Remove the existing Ark namespace (which includes the deployment), CRDs, and ClusterRoleBinding.
|
||||
|
||||
These steps are provided in a script here:
|
||||
|
||||
```bash
|
||||
kubectl scale --namespace heptio-ark deployment/ark --replicas 0
|
||||
OS=$(uname | tr '[:upper:]' '[:lower:]') # Determine if the OS is Linux or macOS
|
||||
ARCH="amd64"
|
||||
|
||||
# Download the velero client/example tarball to and unpack
|
||||
curl -L https://github.com/vmware-tanzu/velero/releases/download/v0.11.0/velero-v0.11.0-${OS}-${ARCH}.tar.gz --output velero-v0.11.0-${OS}-${ARCH}.tar.gz
|
||||
tar xvf velero-v0.11.0-${OS}-${ARCH}.tar.gz
|
||||
|
||||
# Create the prerequisite CRDs and namespace
|
||||
kubectl apply -f config/common/00-prereqs.yaml
|
||||
|
||||
# Download and unpack the crd-migrator tool
|
||||
curl -L https://github.com/vmware/crd-migration-tool/releases/download/v1.0.0/crd-migration-tool-v1.0.0-${OS}-${ARCH}.tar.gz --output crd-migration-tool-v1.0.0-${OS}-${ARCH}.tar.gz
|
||||
tar xvf crd-migration-tool-v1.0.0-${OS}-${ARCH}.tar.gz
|
||||
|
||||
# Run the tool against your cluster.
|
||||
./crd-migrator \
|
||||
--from ark.heptio.com/v1 \
|
||||
--to velero.io/v1 \
|
||||
--label-mappings ark.heptio.com:velero.io,ark-schedule:velero.io/schedule-name \
|
||||
--annotation-mappings ark.heptio.com:velero.io \
|
||||
--namespace-mappings heptio-ark:velero
|
||||
|
||||
|
||||
# Copy the necessary secret from the ark namespace
|
||||
kubectl get secret --namespace heptio-ark cloud-credentials --export -o yaml | kubectl apply --namespace velero -f -
|
||||
|
||||
# Apply the Velero deployment and restic DaemonSet for your platform
|
||||
## GCP
|
||||
#kubectl apply -f config/gcp/10-deployment.yaml
|
||||
#kubectl apply -f config/gcp/20-restic-daemonset.yaml
|
||||
## AWS
|
||||
#kubectl apply -f config/aws/10-deployment.yaml
|
||||
#kubectl apply -f config/aws/20-restic-daemonset.yaml
|
||||
## Azure
|
||||
#kubectl apply -f config/azure/00-deployment.yaml
|
||||
#kubectl apply -f config/azure/20-restic-daemonset.yaml
|
||||
|
||||
# Verify your data is still present
|
||||
./velero get backup
|
||||
./velero get restore
|
||||
|
||||
# Remove old Ark data
|
||||
kubectl delete namespace heptio-ark
|
||||
kubectl delete crds -l component=ark
|
||||
kubectl delete clusterrolebindings -l component=ark
|
||||
```
|
||||
|
||||
[1]: https://velero.io/docs/v0.10.0/upgrading-to-v0.10
|
||||
@@ -202,7 +202,7 @@ difference is small.
|
||||
|
||||
## Customize Restore Helper Container
|
||||
|
||||
Velero uses a helper init container when performing a restic restore. By default, the image for this container is `gcr.io/heptio-images/velero-restic-restore-helper:<VERSION>`,
|
||||
Velero uses a helper init container when performing a restic restore. By default, the image for this container is `velero/velero-restic-restore-helper:<VERSION>`,
|
||||
where `VERSION` matches the version/tag of the main Velero image. You can customize the image that is used for this helper by creating a ConfigMap in the Velero namespace with
|
||||
the alternate image.
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ kubectl edit deployment/velero -n velero
|
||||
...
|
||||
containers:
|
||||
- name: velero
|
||||
image: gcr.io/heptio-images/velero:latest
|
||||
image: velero/velero:latest
|
||||
command:
|
||||
- /velero
|
||||
args:
|
||||
|
||||
Reference in New Issue
Block a user