From 81cf500f29a966805391819b04bee15f861729a8 Mon Sep 17 00:00:00 2001
From: Matt Moore <mattmoor@chainguard.dev>
Date: Thu, 16 Dec 2021 17:37:28 -0800
Subject: [PATCH] Try swapping registry:2 for the registry add-on

---
 .../workflows/integration-layers-tests.yaml    |  1 +
 ...egration-mis.yaml => integration-misc.yaml} |  1 +
 .github/workflows/integration-run-tests.yaml   |  1 +
 integration/k8s-job.yaml                       | 18 ++++++++++++++++--
 integration/k8s_test.go                        |  4 ++--
 scripts/minikube-setup.sh                      |  9 ++++++++-
 scripts/travis-setup.sh                        |  1 -
 7 files changed, 29 insertions(+), 6 deletions(-)
 rename .github/workflows/{integration-mis.yaml => integration-misc.yaml} (97%)

diff --git a/.github/workflows/integration-layers-tests.yaml b/.github/workflows/integration-layers-tests.yaml
index 3ba9b05501..df705d8f8c 100644
--- a/.github/workflows/integration-layers-tests.yaml
+++ b/.github/workflows/integration-layers-tests.yaml
@@ -28,4 +28,5 @@ jobs:
     - name: Run integration-test-layers
       run: |
         make travis-setup
+        make minikube-setup
         make integration-test-layers
diff --git a/.github/workflows/integration-mis.yaml b/.github/workflows/integration-misc.yaml
similarity index 97%
rename from .github/workflows/integration-mis.yaml
rename to .github/workflows/integration-misc.yaml
index ca7f77191d..0e928202c7 100644
--- a/.github/workflows/integration-mis.yaml
+++ b/.github/workflows/integration-misc.yaml
@@ -37,4 +37,5 @@ jobs:
       - name: Run integration-test-misc
         run : |
           make travis-setup
+          make minikube-setup
           make integration-test-misc
\ No newline at end of file
diff --git a/.github/workflows/integration-run-tests.yaml b/.github/workflows/integration-run-tests.yaml
index 4138cd8fba..62921e8cb6 100644
--- a/.github/workflows/integration-run-tests.yaml
+++ b/.github/workflows/integration-run-tests.yaml
@@ -27,4 +27,5 @@ jobs:
       - name: Run integration-test-run
         run: |
           make travis-setup
+          make minikube-setup
           make integration-test-run
\ No newline at end of file
diff --git a/integration/k8s-job.yaml b/integration/k8s-job.yaml
index c5809c4a28..78eecc2925 100644
--- a/integration/k8s-job.yaml
+++ b/integration/k8s-job.yaml
@@ -7,16 +7,30 @@ spec:
     spec:
       hostNetwork: true
       containers:
+      - name: debug
+        image: gcr.io/distroless/base:debug
+        command: ["/busybox/sh", "-c"]
+        args:
+        - |
+          echo LISTING WORKSPACE
+          find /host-root -type f
+        volumeMounts:
+        - name: host-root
+          mountPath: /host-root
       - name: kaniko
         image: localhost:5000/executor:latest
+        workingDir: /workspace
         args: [ "--context=dir:///workspace",
                 "--destination={{.KanikoImage}}"]
         volumeMounts:
-          - name: context
-            mountPath: /workspace
+        - name: context
+          mountPath: /workspace
       restartPolicy: Never
       volumes:
       - name: context
         hostPath:
           path: {{.Context}}
+      - name: host-root
+        hostPath:
+          path: /
   backoffLimit: 1
diff --git a/integration/k8s_test.go b/integration/k8s_test.go
index d3a11da611..0a1a9ca40d 100644
--- a/integration/k8s_test.go
+++ b/integration/k8s_test.go
@@ -89,7 +89,7 @@ func TestK8s(t *testing.T) {
 			t.Logf("Waiting for K8s kaniko build job to finish: %s\n",
 				"job/kaniko-test-"+job.Name)
 
-			kubeWaitCmd := exec.Command("kubectl", "wait", "--for=condition=complete", "--timeout=5m",
+			kubeWaitCmd := exec.Command("kubectl", "wait", "--for=condition=complete", "--timeout=1m",
 				"job/kaniko-test-"+job.Name)
 			if out, errR := RunCommandWithoutTest(kubeWaitCmd); errR != nil {
 				t.Log(kubeWaitCmd.Args)
@@ -110,7 +110,7 @@ func TestK8s(t *testing.T) {
 					t.Log(string(outD))
 				}
 
-				logsCmd := exec.Command("kubectl", "logs", "job/kaniko-test-"+job.Name)
+				logsCmd := exec.Command("kubectl", "logs", "--all-containers", "job/kaniko-test-"+job.Name)
 				outL, errL := RunCommandWithoutTest(logsCmd)
 				if errL != nil {
 					t.Error(errL)
diff --git a/scripts/minikube-setup.sh b/scripts/minikube-setup.sh
index a92a0223a0..1983afc769 100755
--- a/scripts/minikube-setup.sh
+++ b/scripts/minikube-setup.sh
@@ -17,4 +17,11 @@ set -ex
 
 curl -Lo minikube https://storage.googleapis.com/minikube-builds/master/minikube-linux-amd64
 sudo install minikube /usr/local/bin/minikube
-minikube start --profile=minikube --driver=docker
\ No newline at end of file
+sudo minikube start --vm-driver=none --force
+sudo minikube status
+sudo chown -R $USER $HOME/.kube $HOME/.minikube
+minikube addons enable registry
+
+kubectl cluster-info
+
+kubectl port-forward --namespace kube-system service/registry 5000:80 &
diff --git a/scripts/travis-setup.sh b/scripts/travis-setup.sh
index c8e9578430..38f0d84282 100755
--- a/scripts/travis-setup.sh
+++ b/scripts/travis-setup.sh
@@ -20,7 +20,6 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun
 sudo apt-get update
 sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
 curl -LO https://storage.googleapis.com/container-diff/latest/container-diff-linux-amd64 && chmod +x container-diff-linux-amd64 && sudo mv container-diff-linux-amd64 /usr/local/bin/container-diff
-docker run -d -p 5000:5000 --restart always --name registry registry:2
 
 mkdir -p $HOME/.docker/
 echo '{}' > $HOME/.docker/config.json