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 detection for kubelet metrics in inttests #3553

Merged
merged 1 commit into from
Oct 4, 2023

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Oct 4, 2023

Description

When inttests are executed with images that contain hashes, the image detection will fail. That's because kubelet won't include the tag, but only the hash in its metrics.

Moreover, properly regex-escape the match string, pull out common logic out of the retry loop and add the missing error check to the scanner.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

When inttests are executed with images that contain hashes, the image
detection will fail. That's because kubelet won't include the tag,
but only the hash in its metrics.

Moreover, properly regex-escape the match string, pull out common logic
out of the retry loop and add the missing error check to the scanner.

Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 requested a review from a team as a code owner October 4, 2023 15:52
@twz123 twz123 requested review from ncopa and jnummelin October 4, 2023 15:52
@twz123 twz123 merged commit b865056 into k0sproject:main Oct 4, 2023
73 checks passed
@twz123 twz123 deleted the inttest-kubelet-metrics-hashes branch October 4, 2023 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants