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: fix KustomizeImage Match function to pass added unit tests #21872

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

chengfang
Copy link
Contributor

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@chengfang chengfang requested a review from a team as a code owner February 13, 2025 16:16
Copy link

bunnyshell bot commented Feb 13, 2025

✅ Preview Environment deployed on Bunnyshell

Component Endpoints
argocd https://argocd-omibge.bunnyenv.com/
argocd-ttyd https://argocd-web-cli-omibge.bunnyenv.com/

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔴 /bns:stop to stop the environment
  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment

Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the intent behind these changes. Can you provide more details including which issue is this PR trying to close?

@chengfang
Copy link
Contributor Author

This is to address some flaws in the current impl when comparing 2 KustomizeImages:

  • when the images uses default tag and so there is no tag part, current Match function produces wrong result.
  • the current Match func the image name from the 2nd image against the first image via hasPrefix, which can be wrong in some cases. For ex, when the 2nd image is [email protected], it will take foo and check if the 1st image contains the prefix foo. The result will be true if the 1st image is [email protected], which is wrong.

Both of these issues can cause problems when comparing an existing KustomizeImage against an update candidate KustomizeImage, e.g., when running argocd-image-updater.

Copy link

codecov bot commented Feb 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.66%. Comparing base (8a447d9) to head (475342b).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #21872      +/-   ##
==========================================
+ Coverage   55.60%   55.66%   +0.06%     
==========================================
  Files         339      339              
  Lines       56869    56868       -1     
==========================================
+ Hits        31622    31658      +36     
+ Misses      22596    22571      -25     
+ Partials     2651     2639      -12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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