fix(argo-cd): Fix fail to render .Values.configs.secret.azureDevops
#2443
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -16,7 +16,7 @@ metadata: | |||||
| {{- end }} | ||||||
| {{- end }} | ||||||
| type: Opaque | ||||||
| {{- if or .Values.configs.secret.githubSecret (or .Values.configs.secret.gitlabSecret .Values.configs.secret.bitbucketUUID .Values.configs.secret.bitbucketServerSecret .Values.configs.secret.gogsSecret (and .Values.configs.secret.azureDevops.username .Values.configs.secret.azureDevops.password) .Values.configs.secret.argocdServerAdminPassword .Values.configs.secret.argocdServerTlsConfig .Values.configs.secret.extra) }} | ||||||
| # Setting a blank data again will wipe admin password/key/cert | ||||||
| data: | ||||||
| {{- with .Values.configs.secret.githubSecret }} | ||||||
|
|
@@ -34,9 +34,10 @@ data: | |||||
| {{- with .Values.configs.secret.gogsSecret }} | ||||||
| webhook.gogs.secret: {{ . | b64enc }} | ||||||
| {{- end }} | ||||||
| {{/* In some environment, `if` condition needed to render. */}} | ||||||
| {{- if and (.Values.configs.secret.azureDevops.username .Values.configs.secret.azureDevops.password) }} | ||||||
|
There was a problem hiding this comment.
Suggested change
Otherwise There was a problem hiding this comment. I fixed in eb6fea3 . 🙋 |
||||||
| webhook.azuredevops.username: {{ .Values.configs.secret.azureDevops.username }} | ||||||
|
There was a problem hiding this comment. We also need b64enc here 🙃 But the rest is LGTM 🚀 There was a problem hiding this comment. Ah~~~~~ will fix 😇 💣 There was a problem hiding this comment. I fixed in ccb41f0 . 🏥 💉 |
||||||
| webhook.azuredevops.password: {{ .Values.configs.secret.azureDevops.password | b64enc }} | ||||||
| {{- end }} | ||||||
| {{- with .Values.configs.secret.argocdServerTlsConfig }} | ||||||
| tls.key: {{ .key | b64enc }} | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default value of
azureDevopsis not empty object ({}), so thewithalways returns true... 😇