Skip to content

Commit

Permalink
fix(argo-workflows): Fix trailing whitespace in controller ConfigMap (#…
Browse files Browse the repository at this point in the history
…2451)

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>
  • Loading branch information
SlaterByte and SlaterByte authored Jan 24, 2024
1 parent 9e70f24 commit 03c26fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions charts/argo-workflows/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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: {{ . }}
Expand Down Expand Up @@ -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 }}
Expand Down

0 comments on commit 03c26fc

Please sign in to comment.