From 49ec752d09acac81f0ddd7556423928fb0596285 Mon Sep 17 00:00:00 2001 From: Yves Schumann Date: Thu, 3 Apr 2025 05:30:35 +0200 Subject: [PATCH] fix(argo-workflows): fix yamllint error 'trailing spaces' (#3233) --- charts/argo-workflows/Chart.yaml | 6 +++--- charts/argo-workflows/templates/_helpers.tpl | 2 +- .../controller/workflow-controller-cluster-roles.yaml | 2 +- .../templates/controller/workflow-controller-crb.yaml | 4 ++-- .../controller/workflow-controller-deployment.yaml | 3 ++- .../templates/controller/workflow-controller-sa.yaml | 2 +- charts/argo-workflows/templates/extra-manifests.yaml | 6 +++--- charts/argo-workflows/templates/server/server-crb.yaml | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml index 02e5e506..32f40053 100644 --- a/charts/argo-workflows/Chart.yaml +++ b/charts/argo-workflows/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v3.6.5 name: argo-workflows description: A Helm chart for Argo Workflows type: application -version: 0.45.11 +version: 0.45.12 icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png home: https://github.com/argoproj/argo-helm sources: @@ -16,5 +16,5 @@ annotations: fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - - kind: changed - description: Bump argo-workflows to v3.6.5 + - kind: fixed + description: Fix yamllint error 'trailing spaces' diff --git a/charts/argo-workflows/templates/_helpers.tpl b/charts/argo-workflows/templates/_helpers.tpl index ebbba978..de7d84be 100644 --- a/charts/argo-workflows/templates/_helpers.tpl +++ b/charts/argo-workflows/templates/_helpers.tpl @@ -90,7 +90,7 @@ Selector labels {{- define "argo-workflows.selectorLabels" -}} {{- if .name -}} app.kubernetes.io/name: {{ include "argo-workflows.name" .context }}-{{ .name }} -{{ end -}} +{{- end }} app.kubernetes.io/instance: {{ .context.Release.Name }} {{- if .component }} app.kubernetes.io/component: {{ .component }} diff --git a/charts/argo-workflows/templates/controller/workflow-controller-cluster-roles.yaml b/charts/argo-workflows/templates/controller/workflow-controller-cluster-roles.yaml index 1e8f764c..9329895a 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-cluster-roles.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-cluster-roles.yaml @@ -174,7 +174,7 @@ rules: verbs: - get resourceNames: - {{/* for HTTP templates */}} + {{- /* for HTTP templates */}} - argo-workflows-agent-ca-certificates {{- with .Values.controller.rbac.secretWhitelist }} - apiGroups: diff --git a/charts/argo-workflows/templates/controller/workflow-controller-crb.yaml b/charts/argo-workflows/templates/controller/workflow-controller-crb.yaml index 93e0557b..2e259983 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-crb.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-crb.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 {{- if .Values.singleNamespace }} kind: RoleBinding -{{ else }} +{{- else }} kind: ClusterRoleBinding {{- end }} metadata: @@ -16,7 +16,7 @@ roleRef: apiGroup: rbac.authorization.k8s.io {{- if .Values.singleNamespace }} kind: Role - {{ else }} + {{- else }} kind: ClusterRole {{- end }} name: {{ template "argo-workflows.controller.fullname" . }} diff --git a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml index b3db5f4e..ad3eea10 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-deployment.yaml @@ -106,7 +106,8 @@ spec: - name: {{ .Values.controller.metricsConfig.portName }} containerPort: {{ .Values.controller.metricsConfig.port }} - containerPort: 6060 - livenessProbe: {{ .Values.controller.livenessProbe | toYaml | nindent 12 }} + livenessProbe: + {{- .Values.controller.livenessProbe | toYaml | nindent 12 }} {{- with .Values.controller.extraContainers }} {{- toYaml . | nindent 8 }} {{- end }} diff --git a/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml b/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml index fd1db89f..e4f10443 100644 --- a/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml +++ b/charts/argo-workflows/templates/controller/workflow-controller-sa.yaml @@ -9,7 +9,7 @@ metadata: {{- with .Values.controller.serviceAccount.labels }} {{- toYaml . | nindent 4 }} {{- end }} - {{ with .Values.controller.serviceAccount.annotations }} + {{- with .Values.controller.serviceAccount.annotations }} annotations: {{- toYaml .| nindent 4 }} {{- end }} diff --git a/charts/argo-workflows/templates/extra-manifests.yaml b/charts/argo-workflows/templates/extra-manifests.yaml index fc9a76b8..3b28ed34 100644 --- a/charts/argo-workflows/templates/extra-manifests.yaml +++ b/charts/argo-workflows/templates/extra-manifests.yaml @@ -1,8 +1,8 @@ -{{ range .Values.extraObjects }} +{{- range .Values.extraObjects }} --- -{{ if typeIs "string" . }} +{{- if typeIs "string" . }} {{- tpl . $ }} {{- else }} {{- tpl (toYaml .) $ }} {{- end }} -{{ end }} +{{- end }} diff --git a/charts/argo-workflows/templates/server/server-crb.yaml b/charts/argo-workflows/templates/server/server-crb.yaml index 4ffb9107..0aeb8136 100644 --- a/charts/argo-workflows/templates/server/server-crb.yaml +++ b/charts/argo-workflows/templates/server/server-crb.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 {{- if .Values.singleNamespace }} kind: RoleBinding -{{ else }} +{{- else }} kind: ClusterRoleBinding {{- end }} metadata: @@ -16,7 +16,7 @@ roleRef: apiGroup: rbac.authorization.k8s.io {{- if .Values.singleNamespace }} kind: Role - {{ else }} + {{- else }} kind: ClusterRole {{- end }} name: {{ template "argo-workflows.server.fullname" . }}