e2e: retry pushing to registry

Author: paulwilljones

make/_shared/tools/00_mod.mk

@@ -615,7 +615,6 @@ $(DOWNLOAD_DIR)/tools/preflight@$(PREFLIGHT_VERSION)_linux_$(HOST_ARCH): | $(DOW
 missing=$(shell (command -v curl >/dev/null || echo curl) \
              && (command -v sha256sum >/dev/null || command -v shasum >/dev/null || echo sha256sum) \
              && (command -v git >/dev/null || echo git) \
-             && (command -v rsync >/dev/null || echo rsync) \
              && (command -v bash >/dev/null || echo bash))
 ifneq ($(missing),)
 $(error Missing required tools: $(missing))

make/test-e2e.mk

@@ -32,9 +32,8 @@ INSTALL_OPTIONS += -f ./make/config/version-checker-values.yaml
 .PHONY: e2e-setup-deps
 e2e-setup-deps: | kind-cluster $(NEEDS_KUBECTL)
 	$(KUBECTL) apply -f test/e2e/manifests/docker-credentials.yaml
-	$(KUBECTL) apply -f test/e2e/manifests/gsa-secret.yaml #TODO replace with local hostPath context
 	$(KUBECTL) apply -f test/e2e/manifests/kaniko.yaml
-	$(KUBECTL) wait pod -lapp=e2e-kaniko --for=jsonpath='{.status.containerStatuses[*].state.terminated.reason}'=Completed
+	$(KUBECTL) wait pod -lapp=e2e-kaniko --timeout=30s --for=jsonpath='{.status.containerStatuses[*].state.terminated.reason}'=Completed
 
 is_e2e_test=
 

test/e2e/manifests/kaniko.yaml

@@ -12,7 +12,8 @@ spec:
             "--context=dir://workspace",
             "--insecure=true",
             "--destination=docker-registry.registry.svc.cluster.local:5000/my-app:0.0.1",
-            "--insecure-registry=docker-registry.registry.svc.cluster.local:5000"]
+            "--insecure-registry=docker-registry.registry.svc.cluster.local:5000",
+            "--push-retry=10"]
     volumeMounts:
       - name: docker-secret
         mountPath: /kaniko/.docker
@@ -44,7 +45,8 @@ spec:
             "--context=dir://workspace",
             "--insecure=true",
             "--destination=docker-registry.registry.svc.cluster.local:5000/my-app:0.0.2",
-            "--insecure-registry=docker-registry.registry.svc.cluster.local:5000"]
+            "--insecure-registry=docker-registry.registry.svc.cluster.local:5000",
+            "--push-retry=10"]
     volumeMounts:
       - name: docker-secret
         mountPath: /kaniko/.docker

test/e2e/suite/version_checker.go

@@ -13,12 +13,29 @@ import (
 )
 
 var _ = Describe("version-checker", func() {
+	// BeforeEach(func() {
+	// 	cmd := exec.Command("kubectl", "apply", "-f", "./manifests/kaniko.yaml")
+	// 	cmd.Stdout = GinkgoWriter
+	// 	cmd.Stderr = GinkgoWriter
+	// 	Expect(cmd.Run()).NotTo(HaveOccurred())
+	// 	cmd = exec.Command("kubectl", "wait", "pod", "-lapp=e2e-kaniko", "--timeout=30s", "--for=jsonpath='{.status.containerStatuses[*].state.terminated.reason}'=Completed")
+	// 	cmd.Stdout = GinkgoWriter
+	// 	cmd.Stderr = GinkgoWriter
+	// 	Expect(cmd.Run()).NotTo(HaveOccurred())
+	// })
+	// AfterEach(func() {
+	// 	cmd := exec.Command("kubectl", "delete", "-f", "./manifests/kaniko.yaml")
+	// 	cmd.Stdout = GinkgoWriter
+	// 	cmd.Stderr = GinkgoWriter
+	// 	Expect(cmd.Run()).NotTo(HaveOccurred())
+	// })
+
 	JustBeforeEach(func() {
 		cmd := exec.Command("kubectl", "apply", "-f", "./manifests/prom2json.yaml")
 		cmd.Stdout = GinkgoWriter
 		cmd.Stderr = GinkgoWriter
 		Expect(cmd.Run()).NotTo(HaveOccurred())
-		cmd = exec.Command("kubectl", "wait", "--for=condition=Complete", "job", "-ljob-name=prom2json")
+		cmd = exec.Command("kubectl", "wait", "--for=condition=Complete", "--timeout=30s", "job", "-ljob-name=prom2json")
 		cmd.Stdout = GinkgoWriter
 		cmd.Stderr = GinkgoWriter
 		Expect(cmd.Run()).NotTo(HaveOccurred())