Skip to content

Commit

Permalink
Merge pull request #202 from zhu733756/fix-initcontainer-on-kind
Browse files Browse the repository at this point in the history
fix initcontainer script
  • Loading branch information
zhu733756 committed Feb 16, 2022
2 parents 85bdd40 + ac62edc commit 3e467c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion manifests/setup/fluent-operator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
- /bin/sh
- '-c'
- set -ex;
echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}' 2>&1) > /fluent-operator/fluent-bit.env
echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}' 2> /dev/null) > /fluent-operator/fluent-bit.env
volumeMounts:
- name: env
mountPath: /fluent-operator
Expand Down
4 changes: 2 additions & 2 deletions manifests/setup/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11274,8 +11274,8 @@ spec:
- command:
- /bin/sh
- -c
- set -ex; echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}' 2>&1)
> /fluent-operator/fluent-bit.env
- set -ex; echo CONTAINER_ROOT_DIR=$(docker info -f '{{.DockerRootDir}}' 2>
/dev/null) > /fluent-operator/fluent-bit.env
image: docker:19.03
name: setenv
volumeMounts:
Expand Down

0 comments on commit 3e467c8

Please sign in to comment.