fix(remote-building): use "Recreate" strategy garden-util (kaniko) an…

…d garden-buildkit deployments (#5125) We need to use the "Recreate" strategy for garden-util and garden-buildkit deployments, because otherwise we can run into issues where multiple Pods are running at the same time Also with the latest main I often get an error "Could not find a running Pod in Deployment garden-buildkit in namespace xxx" – this change fixes that too.
garden-io · Sep 21, 2023 · 541851b · 541851b
1 parent 2df5c54
commit 541851b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/core/src/plugins/kubernetes/container/build/buildkit.ts b/core/src/plugins/kubernetes/container/build/buildkit.ts
@@ -385,6 +385,11 @@ export function getBuildkitDeployment(
           app: buildkitDeploymentName,
         },
       },
+      strategy: {
+        // Note: When updating the deployment, we make sure to kill off old buildkit pods before new pods are started.
+        // This is important because with multiple running Pods we might end up syncing or building to the wrong Pod.
+        type: "Recreate",
+      },
       template: {
         metadata: {
           labels: {

diff --git a/core/src/plugins/kubernetes/container/build/common.ts b/core/src/plugins/kubernetes/container/build/common.ts
@@ -479,6 +479,11 @@ export function getUtilManifests(
           app: utilDeploymentName,
         },
       },
+      strategy: {
+        // Note: When updating the deployment, we make sure to kill off old buildkit pods before new pods are started.
+        // This is important because with multiple running Pods we might end up syncing or building to the wrong Pod.
+        type: "Recreate",
+      },
       template: {
         metadata: {
           labels: {

diff --git a/core/test/unit/src/plugins/kubernetes/container/build/buildkit.ts b/core/test/unit/src/plugins/kubernetes/container/build/buildkit.ts
@@ -73,6 +73,10 @@ describe("buildkit build", () => {
         },
       })
 
+      expect(result.spec.strategy).eql({
+        type: "Recreate",
+      })
+
       expect(result.spec.template.spec?.containers.length === 2)
 
       expect(result.spec.template.spec?.containers[0]).eql({

diff --git a/core/test/unit/src/plugins/kubernetes/container/build/common.ts b/core/test/unit/src/plugins/kubernetes/container/build/common.ts
@@ -68,6 +68,9 @@ describe("common build", () => {
           spec: {
             replicas: 1,
             selector: { matchLabels: { app: "garden-util" } },
+            strategy: {
+              type: "Recreate",
+            },
             template: {
               metadata: { labels: { app: "garden-util" }, annotations: undefined },
               spec: {