vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename restic-init-container to ark-restic-restore-helper 

Signed-off-by: Steve Kriss <steve@heptio.com>
pull/541/head
Steve Kriss 2018-06-11 10:16:03 -07:00
parent 459fe663ee
commit 81520a9b86
4 changed files with 10 additions and 7 deletions

4
Dockerfile-restic-init-container.alpine → Dockerfile-ark-restic-restore-helper.alpine
View File

@ -16,8 +16,8 @@ FROM alpine:3.7
MAINTAINER Steve Kriss <steve@heptio.com> MAINTAINER Steve Kriss <steve@heptio.com>
ADD /bin/linux/amd64/restic-init-container . ADD /bin/linux/amd64/ark-restic-restore-helper .
USER nobody:nobody USER nobody:nobody
ENTRYPOINT [ "/restic-init-container" ] ENTRYPOINT [ "/ark-restic-restore-helper" ]

6
Makefile
View File

@ -60,7 +60,7 @@ IMAGE := $(REGISTRY)/$(BIN)
# If you want to build AND push all containers, see the 'all-push' rule. # If you want to build AND push all containers, see the 'all-push' rule.
all: all:
@$(MAKE) build @$(MAKE) build
@$(MAKE) build BIN=restic-init-container @$(MAKE) build BIN=ark-restic-restore-helper
build-%: build-%:
@$(MAKE) --no-print-directory ARCH=$* build @$(MAKE) --no-print-directory ARCH=$* build
@ -117,7 +117,7 @@ DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION))
all-containers: all-containers:
$(MAKE) container $(MAKE) container
$(MAKE) container BIN=restic-init-container $(MAKE) container BIN=ark-restic-restore-helper
container: verify test .container-$(DOTFILE_IMAGE) container-name container: verify test .container-$(DOTFILE_IMAGE) container-name
.container-$(DOTFILE_IMAGE): _output/bin/$(GOOS)/$(GOARCH)/$(BIN) $(DOCKERFILE) .container-$(DOTFILE_IMAGE): _output/bin/$(GOOS)/$(GOARCH)/$(BIN) $(DOCKERFILE)
@ -130,7 +130,7 @@ container-name:
all-push: all-push:
$(MAKE) push $(MAKE) push
$(MAKE) push BIN=restic-init-container $(MAKE) push BIN=ark-restic-restore-helper
push: .push-$(DOTFILE_IMAGE) push-name push: .push-$(DOTFILE_IMAGE) push-name
.push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE) .push-$(DOTFILE_IMAGE): .container-$(DOTFILE_IMAGE)

0
cmd/restic-init-container/main.go → cmd/ark-restic-restore-helper/main.go
View File

7
pkg/restore/restic_restore_action.go
View File

@ -65,8 +65,11 @@ func (a *resticRestoreAction) Execute(obj runtime.Unstructured, restore *api.Res
log.Info("Restic snapshot ID annotations found") log.Info("Restic snapshot ID annotations found")
initContainer := corev1.Container{ initContainer := corev1.Container{
Name: restic.InitContainer, Name: restic.InitContainer,
Image: "gcr.io/heptio-images/restic-init-container:latest", // TODO don't hardcode the tag as "latest". We should probably be defaulting
// to a tag that matches the Ark binary version, and possibly allowing it to
// be overriden via cmd-line flag to Ark.
Image: "gcr.io/heptio-images/ark-restic-restore-helper:latest",
Args: []string{string(restore.UID)}, Args: []string{string(restore.UID)},
Env: []corev1.EnvVar{ Env: []corev1.EnvVar{
{ {