Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix image_scan.sh script and download trivy version #7950

Merged
merged 1 commit into from
Jul 13, 2023

Conversation

osodracnai
Copy link
Contributor

Proposed Changes

This references to the bump trivy version PR #7738 and also #7949
It removes the 32 bit archs from download and adds the now supported s390x arch

Types of Changes

Verification

Testing

Linked Issues

User-Facing Change


Further Comments

@osodracnai osodracnai force-pushed the fix-trivy branch 3 times, most recently from e6e2f51 to fc36bf9 Compare July 12, 2023 15:45
@codecov
Copy link

codecov bot commented Jul 12, 2023

Codecov Report

Patch coverage has no change and project coverage change: +4.14 🎉

Comparison is base (6c44b06) 47.13% compared to head (f1a58fa) 51.28%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7950      +/-   ##
==========================================
+ Coverage   47.13%   51.28%   +4.14%     
==========================================
  Files         143      143              
  Lines       14544    14564      +20     
==========================================
+ Hits         6856     7469     +613     
+ Misses       6595     5901     -694     
- Partials     1093     1194     +101     
Flag Coverage Δ
e2etests 49.19% <ø> (?)
inttests 44.29% <ø> (-0.22%) ⬇️
unittests 19.85% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 42 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@osodracnai osodracnai marked this pull request as ready for review July 12, 2023 16:31
@osodracnai osodracnai requested a review from a team as a code owner July 12, 2023 16:31
Dockerfile.dapper Outdated Show resolved Hide resolved
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
@osodracnai osodracnai merged commit 58a8deb into k3s-io:master Jul 13, 2023
6 checks passed
osodracnai added a commit to osodracnai/k3s that referenced this pull request Jul 13, 2023
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 58a8deb)
osodracnai added a commit to osodracnai/k3s that referenced this pull request Jul 13, 2023
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 58a8deb)
osodracnai added a commit to osodracnai/k3s that referenced this pull request Jul 13, 2023
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 58a8deb)
osodracnai added a commit that referenced this pull request Jul 14, 2023
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 58a8deb)
osodracnai added a commit that referenced this pull request Jul 14, 2023
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 58a8deb)
osodracnai added a commit that referenced this pull request Jul 14, 2023
Signed-off-by: Ian Cardoso <osodracnai@gmail.com>
(cherry picked from commit 58a8deb)
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.

3 participants