From 365a99a4dea38a605e5c6453c6827c402bc75241 Mon Sep 17 00:00:00 2001
From: Nikola Jokic <nikola-jokic@github.com>
Date: Thu, 29 Sep 2022 16:03:15 +0200
Subject: [PATCH] Removed exposing git token for kaniko, removed testing
 comments, added wait for kaniko

---
 packages/k8s/src/k8s/index.ts                 | 8 ++++++++
 packages/k8s/src/k8s/kaniko.ts                | 6 ------
 packages/k8s/tests/run-container-step-test.ts | 3 ---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/k8s/src/k8s/index.ts b/packages/k8s/src/k8s/index.ts
index 8051363..6aa0013 100644
--- a/packages/k8s/src/k8s/index.ts
+++ b/packages/k8s/src/k8s/index.ts
@@ -474,7 +474,15 @@ export async function containerBuild(
 ): Promise<string> {
   const registryUri = `localhost:${registryNodePort()}/${imagePath}`
   const pod = kanikoPod(args.dockerfile, imagePath)
+  if (!pod.metadata?.name) {
+    throw new Error('kaniko pod name is not set')
+  }
   await k8sApi.createNamespacedPod(namespace(), pod)
+  await waitForPodPhases(
+    pod.metadata.name,
+    new Set([PodPhase.SUCCEEDED]),
+    new Set([PodPhase.PENDING, PodPhase.UNKNOWN, PodPhase.RUNNING])
+  )
   return registryUri
 }
 
diff --git a/packages/k8s/src/k8s/kaniko.ts b/packages/k8s/src/k8s/kaniko.ts
index 0050fb0..ae803e7 100644
--- a/packages/k8s/src/k8s/kaniko.ts
+++ b/packages/k8s/src/k8s/kaniko.ts
@@ -50,12 +50,6 @@ export function kanikoPod(
       readOnly: true
     }
   ]
-  c.env = [
-    {
-      name: 'GIT_TOKEN',
-      value: process.env.GITHUB_TOKEN
-    }
-  ]
   c.args = [
     `--dockerfile=${path.basename(dockerfile)}`,
     `--context=dir://${KANIKO_MOUNT_PATH}`,
diff --git a/packages/k8s/tests/run-container-step-test.ts b/packages/k8s/tests/run-container-step-test.ts
index 49861a6..0996c4b 100644
--- a/packages/k8s/tests/run-container-step-test.ts
+++ b/packages/k8s/tests/run-container-step-test.ts
@@ -56,9 +56,6 @@ describe('run container step with docker build', () => {
     const { registryName, registryPort, nodePort } =
       await testHelper.createContainerRegistry()
 
-    // process.env.RUNNER_CONTAINER_HOOKS_REGISTRY_HOST = 'docker-registry'
-    // process.env.RUNNER_CONTAINER_HOOKS_REGISTRY_PORT = '5000'
-    // process.env.RUNNER_CONTAINER_HOOKS_REGISTRY_NODE_PORT = '31500'
     process.env.RUNNER_CONTAINER_HOOKS_REGISTRY_HOST = registryName
     process.env.RUNNER_CONTAINER_HOOKS_REGISTRY_PORT = registryPort.toString()
     process.env.RUNNER_CONTAINER_HOOKS_REGISTRY_NODE_PORT = nodePort.toString()