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(argo-workflows): Fix trailing whitespace in controller ConfigMap #2451

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

SlaterByte
Copy link
Contributor

@SlaterByte SlaterByte commented Jan 24, 2024

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.

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).

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>
Copy link
Collaborator

@vladlosev vladlosev left a comment

Choose a reason for hiding this comment

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

LGTM

@yu-croco yu-croco merged commit 03c26fc into argoproj:main Jan 24, 2024
7 checks passed
@SlaterByte SlaterByte deleted the aw-fix-whitespace branch January 25, 2024 13:08
pdrastil added a commit to pdrastil/argo-helm that referenced this pull request Jan 30, 2024
* pdrastil/main:
  fix(argo-cd): Restart argocd-server when argocd-cm CM is updated (argoproj#2459)
  chore(deps): bump tj-actions/changed-files from 42.0.0 to 42.0.2 (argoproj#2458)
  chore(deps): bump actions/upload-artifact from 4.2.0 to 4.3.0 (argoproj#2457)
  docs(argo-workflows): Add MySQL persistence support explicitly on README (argoproj#2448)
  fix(argo-cd): Fix Repo server `serviceaccount` label template (argoproj#2454)
  chore(argo-rollouts): Update dependency argoproj/argo-rollouts to v1.6.5 (argoproj#2453)
  docs(argocd-apps): Add deprecated note for Argo CD Extensions (argoproj#2449)
  fix(argo-workflows): Fix trailing whitespace in controller ConfigMap (argoproj#2451)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants