fix(kubernetes): make preStop command work with busybox (#3568)

* fix(kubernetes): make preStop command work with busybox The pgrep -c option does not exist in busybox. Make the preStop command more portable. This avoids a weird error message in the logs of Garden Pods including the util container.
garden-io · Mar 6, 2023 · 4aa0141 · 4aa0141
1 parent 89b55d3
commit 4aa0141
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/plugins/kubernetes/container/build/common.ts b/core/src/plugins/kubernetes/container/build/common.ts
@@ -446,7 +446,7 @@ export function getUtilContainer(authSecretName: string, provider: KubernetesPro
           command: [
             "/bin/sh",
             "-c",
-            "until test $(pgrep -fc '^[^ ]+rsync') = 1; do echo waiting for rsync to finish...; sleep 1; done",
+            "until test $(pgrep -f '^[^ ]+rsync' | wc -l) = 1; do echo waiting for rsync to finish...; sleep 1; done",
           ],
         },
       },

diff --git a/core/test/unit/src/plugins/kubernetes/container/build/buildkit.ts b/core/test/unit/src/plugins/kubernetes/container/build/buildkit.ts
@@ -146,7 +146,7 @@ describe("buildkit build", () => {
               command: [
                 "/bin/sh",
                 "-c",
-                "until test $(pgrep -fc '^[^ ]+rsync') = 1; do echo waiting for rsync to finish...; sleep 1; done",
+                "until test $(pgrep -f '^[^ ]+rsync' | wc -l) = 1; do echo waiting for rsync to finish...; sleep 1; done",
               ],
             },
           },

diff --git a/core/test/unit/src/plugins/kubernetes/container/build/common.ts b/core/test/unit/src/plugins/kubernetes/container/build/common.ts
@@ -93,7 +93,7 @@ describe("common build", () => {
                           command: [
                             "/bin/sh",
                             "-c",
-                            "until test $(pgrep -fc '^[^ ]+rsync') = 1; do echo waiting for rsync to finish...; sleep 1; done",
+                            "until test $(pgrep -f '^[^ ]+rsync' | wc -l) = 1; do echo waiting for rsync to finish...; sleep 1; done",
                           ],
                         },
                       },