Add diffutils to the trace initcontainer #185

yuvipanda · 2022-05-21T19:52:28Z

Without this, busybox's diff is used and I get the following message about
it not supporting -I:

+ make ARCH=x86 prepare
diff: unrecognized option: I
BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary.

Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2

Compare files line by line and output the differences between them.
This implementation supports unified diffs only.

        -a      Treat all files as text
        -b      Ignore changes in the amount of whitespace
        -B      Ignore changes whose lines are all blank
        -d      Try hard to find a smaller set of changes
        -i      Ignore case differences
        -L      Use LABEL instead of the filename in the unified header
        -N      Treat absent files as empty
        -q      Output only whether files differ
        -r      Recurse
        --no-dereference Don't follow symlinks
        -S      Start with FILE when comparing directories
        -T      Make tabs line up by prefixing a tab when necessary
        -s      Report when two files are the same
        -t      Expand tabs to spaces in output
        -U      Output LINES lines of context
        -w      Ignore all whitespace
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/inat.h' differs from latest version at 'arch/x86/include/asm/inat.h'
diff: unrecognized option: I
BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary.

Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2

Compare files line by line and output the differences between them.
This implementation supports unified diffs only.

        -a      Treat all files as text
        -b      Ignore changes in the amount of whitespace
        -B      Ignore changes whose lines are all blank
        -d      Try hard to find a smaller set of changes
        -i      Ignore case differences
        -L      Use LABEL instead of the filename in the unified header
        -N      Treat absent files as empty
        -q      Output only whether files differ
        -r      Recurse
        --no-dereference Don't follow symlinks
        -S      Start with FILE when comparing directories
        -T      Make tabs line up by prefixing a tab when necessary
        -s      Report when two files are the same
        -t      Expand tabs to spaces in output
        -U      Output LINES lines of context
        -w      Ignore all whitespace
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/insn.h' differs from latest version at 'arch/x86/include/asm/insn.h'
diff: unrecognized option: I
BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary.

Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2

Compare files line by line and output the differences between them.
This implementation supports unified diffs only.

        -a      Treat all files as text
        -b      Ignore changes in the amount of whitespace
        -B      Ignore changes whose lines are all blank
        -d      Try hard to find a smaller set of changes
        -i      Ignore case differences
        -L      Use LABEL instead of the filename in the unified header
        -N      Treat absent files as empty
        -q      Output only whether files differ
        -r      Recurse
        --no-dereference Don't follow symlinks
        -S      Start with FILE when comparing directories
        -T      Make tabs line up by prefixing a tab when necessary
        -s      Report when two files are the same
        -t      Expand tabs to spaces in output
        -U      Output LINES lines of context
        -w      Ignore all whitespace
Warning: Kernel ABI header at 'tools/arch/x86/lib/inat.c' differs from latest version at 'arch/x86/lib/inat.c'
diff: unrecognized option: I
BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary.

Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2

Compare files line by line and output the differences between them.
This implementation supports unified diffs only.

        -a      Treat all files as text
        -b      Ignore changes in the amount of whitespace
        -B      Ignore changes whose lines are all blank
        -d      Try hard to find a smaller set of changes
        -i      Ignore case differences
        -L      Use LABEL instead of the filename in the unified header
        -N      Treat absent files as empty
        -q      Output only whether files differ
        -r      Recurse
        --no-dereference Don't follow symlinks
        -S      Start with FILE when comparing directories
        -T      Make tabs line up by prefixing a tab when necessary
        -s      Report when two files are the same
        -t      Expand tabs to spaces in output
        -U      Output LINES lines of context
        -w      Ignore all whitespace
Warning: Kernel ABI header at 'tools/arch/x86/lib/insn.c' differs from latest version at 'arch/x86/lib/insn.c'
+ find /linux-generic-5.4.144+ -regex '.*\.c\|.*\.txt\|.*Makefile\|.*Build\|.*Kconfig' -type f -delete

real    10m3.441s
user    0m19.081s
sys     0m7.855s
+ rm -rf /usr/src/linux-generic-5.4.144+

real    0m0.001s
user    0m0.001s
sys     0m0.000s
+ mv /linux-generic-5.4.144+ /usr/src

real    0m0.001s
user    0m0.001s
sys     0m0.000s
+ touch /usr/src/linux-generic-5.4.144+/.installed
+ HEADERS_TARGET=/usr/src/linux-generic-5.4.144+
+ mkdir -p /lib/modules/5.4.144+
+ ln -sf /usr/src/linux-generic-5.4.144+ /lib/modules/5.4.144+/source
+ ln -sf /usr/src/linux-generic-5.4.144+ /lib/modules/5.4.144+/build
+ touch /lib/modules/.installed
+ exit 0

Brings in iovisor/kubectl-trace#185 and iovisor/kubectl-trace#184, fixing jupyterhub/mybinder.org-deploy#2171 (comment)

consideRatio · 2022-05-28T14:20:41Z

build/init/fetch-linux-headers.sh

@@ -27,7 +27,7 @@ generate_headers()
 }

 fetch_cos_linux_sources()
-{
+{S


Suggested change

{S

{

This seems like a typo @yuvipanda!

consideRatio · 2022-05-28T14:21:49Z

build/init/fetch-linux-headers.sh

@@ -49,7 +49,7 @@ fetch_generic_linux_sources()

  echo "Fetching upstream kernel sources for ${kernel_version}."
  mkdir -p "${BUILD_DIR}"
-  curl -sL "https://www.kernel.org/pub/linux/kernel/v${major_version}.x/linux-$kernel_version.tar.gz" \
+  curl -sSL "https://www.kernel.org/pub/linux/kernel/v${major_version}.x/linux-$kernel_version.tar.gz" \


Using -S here alongside -s seems fine.

-s, --silent Silent mode -S, --show-error Show error even when -s is used

@yuvipanda this is part of #184 so I figure it should be removed from this PR.

fntlnz · 2022-07-27T12:41:09Z

@dalehamel PTAL

yuvipanda · 2023-01-10T23:48:49Z

I'm cleaning through my open PRs, and closing this one as there doesn't seem to be much progress. Please do re-open if there is interest in accepting this. Thank you for your wonderful tool!

yuvipanda · 2023-10-26T08:11:36Z

Unfortunately, I just validated this is still required :( Would love for someone to review and merge this so I can stop having to use my own container image :)

Without this, busybox's `diff` is used and I get the following message about it not supporting `-I`: ``` + make ARCH=x86 prepare diff: unrecognized option: I BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary. Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2 Compare files line by line and output the differences between them. This implementation supports unified diffs only. -a Treat all files as text -b Ignore changes in the amount of whitespace -B Ignore changes whose lines are all blank -d Try hard to find a smaller set of changes -i Ignore case differences -L Use LABEL instead of the filename in the unified header -N Treat absent files as empty -q Output only whether files differ -r Recurse --no-dereference Don't follow symlinks -S Start with FILE when comparing directories -T Make tabs line up by prefixing a tab when necessary -s Report when two files are the same -t Expand tabs to spaces in output -U Output LINES lines of context -w Ignore all whitespace Warning: Kernel ABI header at 'tools/arch/x86/include/asm/inat.h' differs from latest version at 'arch/x86/include/asm/inat.h' diff: unrecognized option: I BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary. Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2 Compare files line by line and output the differences between them. This implementation supports unified diffs only. -a Treat all files as text -b Ignore changes in the amount of whitespace -B Ignore changes whose lines are all blank -d Try hard to find a smaller set of changes -i Ignore case differences -L Use LABEL instead of the filename in the unified header -N Treat absent files as empty -q Output only whether files differ -r Recurse --no-dereference Don't follow symlinks -S Start with FILE when comparing directories -T Make tabs line up by prefixing a tab when necessary -s Report when two files are the same -t Expand tabs to spaces in output -U Output LINES lines of context -w Ignore all whitespace Warning: Kernel ABI header at 'tools/arch/x86/include/asm/insn.h' differs from latest version at 'arch/x86/include/asm/insn.h' diff: unrecognized option: I BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary. Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2 Compare files line by line and output the differences between them. This implementation supports unified diffs only. -a Treat all files as text -b Ignore changes in the amount of whitespace -B Ignore changes whose lines are all blank -d Try hard to find a smaller set of changes -i Ignore case differences -L Use LABEL instead of the filename in the unified header -N Treat absent files as empty -q Output only whether files differ -r Recurse --no-dereference Don't follow symlinks -S Start with FILE when comparing directories -T Make tabs line up by prefixing a tab when necessary -s Report when two files are the same -t Expand tabs to spaces in output -U Output LINES lines of context -w Ignore all whitespace Warning: Kernel ABI header at 'tools/arch/x86/lib/inat.c' differs from latest version at 'arch/x86/lib/inat.c' diff: unrecognized option: I BusyBox v1.34.1 (2022-04-04 10:19:27 UTC) multi-call binary. Usage: diff [-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2 Compare files line by line and output the differences between them. This implementation supports unified diffs only. -a Treat all files as text -b Ignore changes in the amount of whitespace -B Ignore changes whose lines are all blank -d Try hard to find a smaller set of changes -i Ignore case differences -L Use LABEL instead of the filename in the unified header -N Treat absent files as empty -q Output only whether files differ -r Recurse --no-dereference Don't follow symlinks -S Start with FILE when comparing directories -T Make tabs line up by prefixing a tab when necessary -s Report when two files are the same -t Expand tabs to spaces in output -U Output LINES lines of context -w Ignore all whitespace Warning: Kernel ABI header at 'tools/arch/x86/lib/insn.c' differs from latest version at 'arch/x86/lib/insn.c' + find /linux-generic-5.4.144+ -regex '.*\.c\|.*\.txt\|.*Makefile\|.*Build\|.*Kconfig' -type f -delete real 10m3.441s user 0m19.081s sys 0m7.855s + rm -rf /usr/src/linux-generic-5.4.144+ real 0m0.001s user 0m0.001s sys 0m0.000s + mv /linux-generic-5.4.144+ /usr/src real 0m0.001s user 0m0.001s sys 0m0.000s + touch /usr/src/linux-generic-5.4.144+/.installed + HEADERS_TARGET=/usr/src/linux-generic-5.4.144+ + mkdir -p /lib/modules/5.4.144+ + ln -sf /usr/src/linux-generic-5.4.144+ /lib/modules/5.4.144+/source + ln -sf /usr/src/linux-generic-5.4.144+ /lib/modules/5.4.144+/build + touch /lib/modules/.installed + exit 0 ```

`tar` can't seem to read what is being passed to it without this, see jupyterhub/mybinder.org-deploy#2171 (comment) for the error message.

yuvipanda · 2023-10-26T08:13:55Z

I've rebased on latest master and cleaned up.

fntlnz · 2023-10-26T08:56:22Z

Thanks @yuvipanda good catch! 🎉

yuvipanda · 2023-10-26T10:59:59Z

@fntlnz yay that's awesome :)

It looks like the build failed so I don't see a new tag in https://quay.io/repository/iovisor/kubectl-trace-init?tab=tags. Any idea what we can do about that?

yuvipanda mentioned this pull request May 21, 2022

Deploy cryptnono jupyterhub/mybinder.org-deploy#2171

Merged

yuvipanda added a commit to cryptnono/cryptnono that referenced this pull request May 22, 2022

Fix fetch-headers initcontainer for non-COS hosts

6659c07

Brings in iovisor/kubectl-trace#185 and iovisor/kubectl-trace#184, fixing jupyterhub/mybinder.org-deploy#2171 (comment)

consideRatio reviewed May 28, 2022

View reviewed changes

fntlnz assigned dalehamel Jul 27, 2022

yuvipanda closed this Jan 10, 2023

yuvipanda reopened this Oct 26, 2023

yuvipanda closed this Oct 26, 2023

yuvipanda reopened this Oct 26, 2023

yuvipanda added 3 commits October 26, 2023 13:42

Add -S to curl command when fetching generic headers

dfbad45

`tar` can't seem to read what is being passed to it without this, see jupyterhub/mybinder.org-deploy#2171 (comment) for the error message.

Fix typo

9516ce1

yuvipanda force-pushed the patch-2 branch from a34abd6 to 9516ce1 Compare October 26, 2023 08:13

fntlnz approved these changes Oct 26, 2023

View reviewed changes

fntlnz merged commit 478404c into iovisor:master Oct 26, 2023
1 of 4 checks passed

consideRatio mentioned this pull request Oct 26, 2023

Add debug info about failures in CI system using the kubernetes-namespace-report action #201

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add diffutils to the trace initcontainer #185

Add diffutils to the trace initcontainer #185

yuvipanda commented May 21, 2022

consideRatio May 28, 2022

consideRatio May 28, 2022

consideRatio May 28, 2022

fntlnz commented Jul 27, 2022

yuvipanda commented Jan 10, 2023

yuvipanda commented Oct 26, 2023

yuvipanda commented Oct 26, 2023

fntlnz commented Oct 26, 2023

yuvipanda commented Oct 26, 2023

Add diffutils to the trace initcontainer #185

Add diffutils to the trace initcontainer #185

Conversation

yuvipanda commented May 21, 2022

consideRatio May 28, 2022

Choose a reason for hiding this comment

consideRatio May 28, 2022

Choose a reason for hiding this comment

consideRatio May 28, 2022

Choose a reason for hiding this comment

fntlnz commented Jul 27, 2022

yuvipanda commented Jan 10, 2023

yuvipanda commented Oct 26, 2023

yuvipanda commented Oct 26, 2023

fntlnz commented Oct 26, 2023

yuvipanda commented Oct 26, 2023