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: Use image configured in spec as fallback before default image for repository server workload #1262

Merged
merged 3 commits into from
Jun 18, 2024

Conversation

tomjo
Copy link
Contributor

@tomjo tomjo commented Feb 21, 2024

What type of PR is this?
/kind bug

What does this PR do / why we need it:

  • The repo server container image version will now fallback to spec.version before falling back to the default version if spec.repo.version is not set. Otherwise users get in the confusing situation of all the argo pods other than repo running a newer version than the repo server.
  • It also fixes some documentation and code comments which were inaccurate after a previous change (fix: Use default image for repository server workload #373). Also cleans up the unused field ArgoCDRepoImageEnvName after that change.

Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

Which issue(s) this PR fixes:

Fixes #623

How to test changes / Special notes to the reviewer:
Added tests for the repo server image and version

Copy link
Collaborator

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

Thanks @tomjo for the PR. I have left a comment, rest all looks good.

controllers/argocd/util.go Outdated Show resolved Hide resolved
tomjo added 2 commits June 17, 2024 17:17
…r repository server workload

Signed-off-by: tomjo <tom.jorissen.it@gmail.com>
…ec.repo.version docs with fallback information

Signed-off-by: tomjo <tom.jorissen.it@gmail.com>
Signed-off-by: tomjo <tom.jorissen.it@gmail.com>
Copy link
Collaborator

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

Thanks alot @tomjo for your contribution.

@svghadi svghadi merged commit aaf77af into argoproj-labs:master Jun 18, 2024
7 checks passed
@svghadi svghadi added the backport-to-redesign Changes which need to be backported to operator-redesign branch label Jun 19, 2024
@svghadi svghadi removed the backport-to-redesign Changes which need to be backported to operator-redesign branch label Jul 10, 2024
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.

Repo Server Image should use spec.version if spec.repo.version is not set
2 participants