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.

Sign up for GitHub

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

Jump to bottom

feat(argo-cd): Add DRY support for Ingress #3081

Merged
merged 11 commits into from
Jan 7, 2025
Merged

feat(argo-cd): Add DRY support for Ingress #3081

merged 11 commits into from
Jan 7, 2025

Conversation

gyajangi1
Copy link
Contributor

@gyajangi1 gyajangi1 commented Dec 17, 2024 •
edited
Loading

Checklist:

  • I have bumped the chart version according to versioning
  • I have updated the documentation according to documentation
  • I have updated the chart changelog with all the changes that come with this pull request according to changelog.
  • Any new values are backwards compatible and/or have sensible default.
  • I have signed off all my commits as required by DCO.
  • My build is green (troubleshooting builds).

@tico24 tico24 marked this pull request as draft December 17, 2024 10:50
@gyajangi1 gyajangi1 changed the title Updated tpl function feat:Extend DRY support for Ingress Dec 17, 2024
@gyajangi1 gyajangi1 changed the title feat:Extend DRY support for Ingress fix:Extend DRY support for Ingress Dec 17, 2024
@gyajangi1 gyajangi1 changed the title fix:Extend DRY support for Ingress fix: Extend DRY support for Ingress Dec 17, 2024
@gyajangi1 gyajangi1 changed the title fix: Extend DRY support for Ingress feat: Extend DRY support for Ingress Dec 17, 2024
@gyajangi1 gyajangi1 changed the title feat: Extend DRY support for Ingress feat(argo-cd): Extend DRY support for Ingress Dec 17, 2024
Ceddaerrix
Ceddaerrix suggested changes Dec 17, 2024
View reviewed changes
charts/argo-cd/templates/argocd-server/ingress.yaml Outdated
@@ -9,7 +9,7 @@ metadata:
labels:
{{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
{{- with .Values.server.ingress.labels }}
{{- toYaml . | nindent 4 }}
{{- tpl (toYaml .) . | nindent 4 }}
Copy link

@Ceddaerrix Ceddaerrix Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

tpl (toYaml .) . within the with context will fail since . here refers to the current context (i.e. .Values.server.ingress.labels) and not the root context.

To refer to the root context, you should change the tpl call to tpl (toYaml .) $

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed tpl call to tpl (toYaml .) $

@gyajangi1 gyajangi1 requested a review from Ceddaerrix December 18, 2024 07:51
@gyajangi1 gyajangi1 changed the title feat(argo-cd): Extend DRY support for Ingress feat(argo-cd): Add DRY support for Ingress Dec 20, 2024
@gyajangi1 gyajangi1 marked this pull request as ready for review December 20, 2024 10:15
@mkilchhofer mkilchhofer marked this pull request as draft December 24, 2024 08:17
@gyajangi1 gyajangi1 marked this pull request as ready for review December 24, 2024 09:51
@yu-croco
Copy link
Collaborator

yu-croco commented Jan 3, 2025

Hi @gyajangi1 , please handle the items below (they are on PR description).

[ ] I have bumped the chart version according to versioning
[ ] I have updated the chart changelog with all the changes that come with this pull request according to changelog.

@yu-croco yu-croco marked this pull request as draft January 3, 2025 10:21
@gyajangi1 gyajangi1 marked this pull request as ready for review January 3, 2025 11:11
@yu-croco
Copy link
Collaborator

yu-croco commented Jan 3, 2025

Hi @gyajangi1 , please handle the items below (they are on PR description).

[ ] I have bumped the chart version according to versioning
[ ] I have updated the chart changelog with all the changes that come with this pull request according to changelog.

Hi @gyajangi1 , you marked this PR as ready but where are the diffs for above?

@gyajangi1
Updated tpl function
7a6635d 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1
Update ingress.yaml
65ba262 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1
reverted changes
2e9cd98 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
gyajangi1 and others added 4 commits January 7, 2025 12:42
@gyajangi1
Updated ingress.yaml
9162e96 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1 @mkilchhofer
Update charts/argo-cd/templates/argocd-server/ingress.yaml
aa28c70 
Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1 @mkilchhofer
Update charts/argo-cd/templates/argocd-server/ingress.yaml
2079426 
Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1
update changelog for tpl function in ingress
b6c3d0e 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1
update changelog for tpl function in ingress
948c082 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1
Update chart version 7.7.14
ddbaef6 
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1 gyajangi1 requested a review from mkilchhofer January 7, 2025 08:07
@gyajangi1 @mkilchhofer
Update charts/argo-cd/Chart.yaml
00790e5 
Co-authored-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
Signed-off-by: gyajangi1 <Sandeep.Gyajangi@ge.com>
@gyajangi1 gyajangi1 requested a review from mkilchhofer January 7, 2025 08:18
@mkilchhofer
fix: Drop trailing spaces
3d0ec16 
Signed-off-by: Marco Maurer (-Kilchhofer) <mkilchhofer@users.noreply.github.com>
@gyajangi1 gyajangi1 requested a review from mkilchhofer January 7, 2025 08:46
@mkilchhofer
Copy link
Member

Thanks @gyajangi1 for your contribution and your patience 🙏

@mkilchhofer mkilchhofer merged commit 9946d3d into argoproj:main Jan 7, 2025
6 checks passed
@rverchere rverchere mentioned this pull request Jan 9, 2025
Closed
mkilchhofer added a commit that referenced this pull request Jan 24, 2025
@mkilchhofer
fix(argo-cd): Address ingress regression of PR #3081
83718a7 
Signed-off-by: Marco Maurer <mkilchhofer@users.noreply.github.com>
@mkilchhofer mkilchhofer mentioned this pull request Jan 24, 2025
Merged
6 tasks
mkilchhofer added a commit that referenced this pull request Jan 24, 2025
@mkilchhofer
fix(argo-cd): Address ingress regression of PR #3081 (#3137)
bf9830c 
Signed-off-by: Marco Maurer <mkilchhofer@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yu-croco yu-croco yu-croco approved these changes

@mbevc1 mbevc1 mbevc1 approved these changes

@mkilchhofer mkilchhofer mkilchhofer approved these changes

@jmeridth jmeridth Awaiting requested review from jmeridth jmeridth is a code owner

@pdrastil pdrastil Awaiting requested review from pdrastil pdrastil is a code owner

@tico24 tico24 Awaiting requested review from tico24 tico24 is a code owner

@Ceddaerrix Ceddaerrix Awaiting requested review from Ceddaerrix

Assignees
No one assigned
Labels
argo-cd size/S
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gyajangi1 @yu-croco @mkilchhofer @mbevc1 @Ceddaerrix