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: the unmatching template issue introduced from #20237 #20410

Merged
merged 3 commits into from
Oct 17, 2024

Conversation

xcompass
Copy link
Contributor

The error in the notification controller shows unmatching "{{end}}"

time="2024-10-16T21:28:48Z" level=error msg="error getting api from namespace: argocd error: error in 'app-health-degraded' teams.potentialAction: template: app-health-degraded:14: unexpected {{end}}"
time="2024-10-16T21:28:48Z" level=error msg="Failed to get api: errors getting apis: [error in 'app-health-degraded' teams.potentialAction: template: app-health-degraded:14: unexpected {{end}}]" resource=argocd/guestbook

This PR is to correct the above issue and make the notification controller happy again!

Since #20237 has not been included in any release yet. No cherry-pick is needed.

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? No
  • 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).

@xcompass xcompass requested a review from a team as a code owner October 16, 2024 21:44
Copy link

bunnyshell bot commented Oct 16, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@xcompass xcompass changed the title Fix the unmatching template issue introduced from #20237 fix: the unmatching template issue introduced from #20237 Oct 16, 2024
@xcompass xcompass force-pushed the fix-unmatching-template branch 2 times, most recently from 6cf0c80 to 4cdf072 Compare October 16, 2024 22:00
The error in the notification controller shows unmatching "{{end}}"
```
error in 'app-health-degraded' teams.potentialAction: template:
app-health-degraded:14: unexpected {{end}}"
```

Signed-off-by: Pan Luo <pan.luo@ubc.ca>
@xcompass xcompass force-pushed the fix-unmatching-template branch from 4cdf072 to 3102f0e Compare October 16, 2024 22:01
Signed-off-by: Pan Luo <pan.luo@ubc.ca>
@xcompass xcompass force-pushed the fix-unmatching-template branch from d6c5964 to 23e2360 Compare October 17, 2024 04:46
@xcompass xcompass requested a review from a team as a code owner October 17, 2024 05:07
Signed-off-by: Pan Luo <pan.luo@ubc.ca>
@xcompass xcompass force-pushed the fix-unmatching-template branch from 206797f to a25bdb4 Compare October 17, 2024 05:29
Copy link

codecov bot commented Oct 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.05%. Comparing base (cc98925) to head (a25bdb4).
Report is 5 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #20410      +/-   ##
==========================================
+ Coverage   56.02%   56.05%   +0.02%     
==========================================
  Files         322      322              
  Lines       44802    44802              
==========================================
+ Hits        25099    25112      +13     
+ Misses      17104    17086      -18     
- Partials     2599     2604       +5     

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

Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

LGTM!!

@ishitasequeira ishitasequeira merged commit 4faf8dd into argoproj:master Oct 17, 2024
27 checks passed
4ch3los pushed a commit to 4ch3los/argo-cd that referenced this pull request Oct 17, 2024
…goproj#20410)

* Fix the unmatching template error

The error in the notification controller shows unmatching "{{end}}"
```
error in 'app-health-degraded' teams.potentialAction: template:
app-health-degraded:14: unexpected {{end}}"
```

Signed-off-by: Pan Luo <pan.luo@ubc.ca>

* update templates to match the install.yaml

Signed-off-by: Pan Luo <pan.luo@ubc.ca>

* fix inconsistent yaml block style formating

Signed-off-by: Pan Luo <pan.luo@ubc.ca>

---------

Signed-off-by: Pan Luo <pan.luo@ubc.ca>
@xcompass xcompass deleted the fix-unmatching-template branch October 18, 2024 05:34
adriananeci pushed a commit to adriananeci/argo-cd that referenced this pull request Dec 4, 2024
…goproj#20410)

* Fix the unmatching template error

The error in the notification controller shows unmatching "{{end}}"
```
error in 'app-health-degraded' teams.potentialAction: template:
app-health-degraded:14: unexpected {{end}}"
```

Signed-off-by: Pan Luo <pan.luo@ubc.ca>

* update templates to match the install.yaml

Signed-off-by: Pan Luo <pan.luo@ubc.ca>

* fix inconsistent yaml block style formating

Signed-off-by: Pan Luo <pan.luo@ubc.ca>

---------

Signed-off-by: Pan Luo <pan.luo@ubc.ca>
Signed-off-by: Adrian Aneci <aneci@adobe.com>
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.

3 participants