Merge pull request #200 from zhu733756/fix-initcontainer-on-kind

Fix initcontainer script
fluent · Feb 15, 2022 · 85bdd40 · 85bdd40
2 parents 55730d0 + 6d4ab7d
commit 85bdd40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/setup/fluent-operator-deployment.yaml b/manifests/setup/fluent-operator-deployment.yaml
@@ -30,7 +30,7 @@ spec:
         - /bin/sh
         - '-c'
         - set -ex;
-          echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}') > /fluent-operator/fluent-bit.env
+          echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}' 2>&1) > /fluent-operator/fluent-bit.env
         volumeMounts:
         - name: env
           mountPath: /fluent-operator

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -11274,7 +11274,7 @@ spec:
       - command:
         - /bin/sh
         - -c
-        - set -ex; echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}')
+        - set -ex; echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}' 2>&1)
           > /fluent-operator/fluent-bit.env
         image: docker:19.03
         name: setenv