Skip to content

calico: add pod2daemon-flexvol-compat - #4933

Merged
imjasonh merged 1 commit into
wolfi-dev:mainfrom
imjasonh:calico-p2d
Aug 30, 2023
Merged

calico: add pod2daemon-flexvol-compat#4933
imjasonh merged 1 commit into
wolfi-dev:mainfrom
imjasonh:calico-p2d

Conversation

@imjasonh

Copy link
Copy Markdown
Contributor

The upstream calico/pod2daemon-flexvol image has these:

crane export calico/pod2daemon-flexvol - | tar -tvf - | grep flexvol              
-rwxr-xr-x  0 0      0     4987070 Nov 22  2021 usr/local/bin/flexvol
-rwxrwxr-x  0 0      0        1703 Nov  9  2021 usr/local/bin/flexvol.sh

And ours has these:

crane export cgr.dev/chainguard/calico-pod2daemon - | tar -tvf - | grep flexvol
-rwxr-xr-x  0 root    root  3870720 Dec 31  1969 usr/bin/calico-pod2daemon-flexvol
-rwxr-xr-x  0 root    root     1703 Dec 31  1969 usr/bin/flexvol.sh

The Tigera operator (and maybe Calico itself) seems to expect the former.

Signed-off-by: Jason Hall <jason@chainguard.dev>
@imjasonh
imjasonh requested a review from a team as a code owner August 29, 2023 21:43
@imjasonh
imjasonh requested review from kaniini and tcnghia August 29, 2023 21:43
@imjasonh
imjasonh enabled auto-merge August 29, 2023 22:42
@imjasonh
imjasonh added this pull request to the merge queue Aug 30, 2023
Merged via the queue into wolfi-dev:main with commit 8953ffd Aug 30, 2023
@imjasonh
imjasonh deleted the calico-p2d branch August 30, 2023 03:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants