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

Signed-off-by: Steve Kriss <steve@heptio.com>

Dockerfile-restic-init-container.alpine → Dockerfile-ark-restic-restore-helper.alpine

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

Makefile

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

pkg/restore/restic_restore_action.go

@@ -65,8 +65,11 @@ func (a *resticRestoreAction) Execute(obj runtime.Unstructured, restore *api.Res
 	log.Info("Restic snapshot ID annotations found")
 
 	initContainer := corev1.Container{
-		Name:  restic.InitContainer,
-		Image: "gcr.io/heptio-images/restic-init-container:latest",
+		Name: restic.InitContainer,
+		// 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)},
 		Env: []corev1.EnvVar{
 			{