fix(argo-workflows): Fix trailing whitespace in controller ConfigMap ()

This commit addresses two places where trailing whitespace may be
generated in the workflow-controller ConfigMap.

When the value `.resourceRateLimit` is not null, a trailing whitespace
is added after "resourceRateLimit:". This commit trims that whitespace.

When the value `.sso.redirectUrl` is left as the default of empty string,
a trailing whitespace is left after "redirectUrl:" as this value is not
quoted. This commit pipes this value through `quote` to ensure this
whitespace is no longer trailing and instead followed by `"` pair.

The main motivation of this commit is to generate a workflow-controller
ConfigMap that is properly pretty-printed, which trailing whitespace
prevents.

Signed-off-by: James Slater <SlaterByte@users.noreply.github.com>
Co-authored-by: James Slater <SlaterByte@users.noreply.github.com>
pull/2449/head^2 argo-workflows-0.40.8
James Slater 2024-01-24 18:57:56 -05:00 committed by GitHub
parent 9e70f24c64
commit 03c26fc21f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
charts/argo-workflows

View File

@ -3,7 +3,7 @@ appVersion: v3.5.4
name: argo-workflows
description: A Helm chart for Argo Workflows
type: application
version: 0.40.7
version: 0.40.8
icon: https://argoproj.github.io/argo-workflows/assets/logo.png
home: https://github.com/argoproj/argo-helm
sources:
@ -17,4 +17,4 @@ annotations:
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: fixed
description: Wrong identation in artifactRepository block
description: Remove trailing whitespace from `.resourceRateLimit` when value is set and `.sso.redirectUrl` when value is an empty string.

View File

@ -19,7 +19,7 @@ data:
parallelism: {{ .Values.controller.parallelism }}
{{- end }}
{{- if .Values.controller.resourceRateLimit }}
resourceRateLimit: {{ toYaml .Values.controller.resourceRateLimit | nindent 6 }}
resourceRateLimit: {{- toYaml .Values.controller.resourceRateLimit | nindent 6 }}
{{- end }}
{{- with .Values.controller.namespaceParallelism }}
namespaceParallelism: {{ . }}
@ -141,7 +141,7 @@ data:
clientSecret:
name: {{ .Values.server.sso.clientSecret.name }}
key: {{ .Values.server.sso.clientSecret.key }}
redirectUrl: {{ .Values.server.sso.redirectUrl }}
redirectUrl: {{ .Values.server.sso.redirectUrl | quote }}
rbac:
enabled: {{ .Values.server.sso.rbac.enabled }}
{{- with .Values.server.sso.scopes }}