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: list manually provided external urls before generated ones #13296

Merged
merged 2 commits into from
Oct 19, 2023

Conversation

nkkowa
Copy link
Contributor

@nkkowa nkkowa commented Apr 19, 2023

Description

Ensures links that are manually added with the link.argocd.argoproj.io annotation take priority over generated links.

Rationale

If an ingress resource should provide HTTPS links but lacks the tls section as described in #8021, users can specify the correct link manually via the annotation. However, this is added after the auto-generated one, causing the default action in the UI to still provide the incorrect URL. You can still access the additional link via the drop-down, though this is counter-intuitive and prevents this annotation from being usable to correct the default behaviour of the link.

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.
  • Optional. My organization is added to USERS.md.
  • 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.

Please see Contribution FAQs if you have questions about your pull-request.

@nkkowa nkkowa force-pushed the fix/external-url-order branch from a6a3ce7 to 85b8f29 Compare April 19, 2023 22:19
@codecov
Copy link

codecov bot commented Apr 19, 2023

Codecov Report

Attention: 6 lines in your changes are missing coverage. Please review.

Comparison is base (aed8494) 49.68% compared to head (512a0f4) 49.70%.
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #13296      +/-   ##
==========================================
+ Coverage   49.68%   49.70%   +0.01%     
==========================================
  Files         267      267              
  Lines       46362    46374      +12     
==========================================
+ Hits        23036    23051      +15     
+ Misses      21067    21063       -4     
- Partials     2259     2260       +1     
Files Coverage Δ
controller/cache/info.go 66.77% <71.42%> (+1.29%) ⬆️

... and 2 files with indirect coverage changes

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

@nkkowa nkkowa requested a review from a team as a code owner October 11, 2023 20:04
@crenshaw-dev crenshaw-dev merged commit 1fe6c89 into argoproj:master Oct 19, 2023
21 checks passed
ymktmk pushed a commit to ymktmk/argo-cd that referenced this pull request Oct 29, 2023
jmilic1 pushed a commit to jmilic1/argo-cd that referenced this pull request Nov 13, 2023
…proj#13296)

Signed-off-by: Nick <nkkowa@gmail.com>
Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>
vladfr pushed a commit to vladfr/argo-cd that referenced this pull request Dec 13, 2023
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants