From 5370921da9770f2b88b2436cae5df709092d8baf Mon Sep 17 00:00:00 2001
From: Travis Johnson <travis@thisguy.codes>
Date: Tue, 28 Jul 2020 14:52:07 -0400
Subject: [PATCH 1/2] deploy util service if using kaniko

The util service was only being deployed if we were using an external registry. However kaniko works fine with an in-cluster registry, and kaniko requires the util service.

Fixes #1962
---
 garden-service/src/plugins/kubernetes/kubernetes.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/garden-service/src/plugins/kubernetes/kubernetes.ts b/garden-service/src/plugins/kubernetes/kubernetes.ts
index 0ff7e307de..38f339f6c9 100644
--- a/garden-service/src/plugins/kubernetes/kubernetes.ts
+++ b/garden-service/src/plugins/kubernetes/kubernetes.ts
@@ -63,8 +63,10 @@ export async function configureProvider({
 
   if (config.buildMode === "cluster-docker" || config.buildMode === "kaniko") {
     config._systemServices.push("build-sync")
+    
+    const usingInClusterRegistry = (!config.deploymentRegistry || config.deploymentRegistry.hostname === inClusterRegistryHostname)
 
-    if (!config.deploymentRegistry || config.deploymentRegistry.hostname === inClusterRegistryHostname) {
+    if (usingInClusterRegistry) {
       // Deploy an in-cluster registry, unless otherwise specified.
       // This is a special configuration, used in combination with the registry-proxy service,
       // to make sure every node in the cluster can resolve the image from the registry we deploy in-cluster.
@@ -75,7 +77,10 @@ export async function configureProvider({
         namespace: config.deploymentRegistry?.namespace || projectName,
       }
       config._systemServices.push("docker-registry", "registry-proxy")
-    } else {
+    }
+    if (!usingInClusterRegistry || config.buildMode === "kaniko") {
+      // If using an external registry we need the util service
+      // Also the kaniko buildMode needs the util service even if using an in-cluster registry
       config._systemServices.push("util")
     }
 

From a9dd0cd4e44f70c58933a0e40247a57e7650b010 Mon Sep 17 00:00:00 2001
From: Travis Johnson <travis@thisguy.codes>
Date: Tue, 28 Jul 2020 15:45:54 -0400
Subject: [PATCH 2/2] lint fix

---
 garden-service/src/plugins/kubernetes/kubernetes.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/garden-service/src/plugins/kubernetes/kubernetes.ts b/garden-service/src/plugins/kubernetes/kubernetes.ts
index 38f339f6c9..dd85874218 100644
--- a/garden-service/src/plugins/kubernetes/kubernetes.ts
+++ b/garden-service/src/plugins/kubernetes/kubernetes.ts
@@ -63,8 +63,9 @@ export async function configureProvider({
 
   if (config.buildMode === "cluster-docker" || config.buildMode === "kaniko") {
     config._systemServices.push("build-sync")
-    
-    const usingInClusterRegistry = (!config.deploymentRegistry || config.deploymentRegistry.hostname === inClusterRegistryHostname)
+
+    const usingInClusterRegistry =
+      !config.deploymentRegistry || config.deploymentRegistry.hostname === inClusterRegistryHostname
 
     if (usingInClusterRegistry) {
       // Deploy an in-cluster registry, unless otherwise specified.