Skip to content

Commit

Permalink
helm: fix linter issue with end tag
Browse files Browse the repository at this point in the history
Recent versions of helm are failing the linter on the end tag
if the tag is "{{- end -}}". Instead, the correct end tag
is "{{- end }}".

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
  • Loading branch information
travisn committed Jan 24, 2022
1 parent 18c1397 commit b1a0918
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion deploy/charts/library/templates/_cluster-psp.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ subjects:
- kind: ServiceAccount
name: rook-ceph-cmd-reporter
namespace: {{ .Release.Namespace }} # namespace:cluster
{{- end -}}
{{- end }}
2 changes: 1 addition & 1 deletion deploy/charts/library/templates/_cluster-rolebinding.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ subjects:
- kind: ServiceAccount
name: rook-ceph-purge-osd
namespace: {{ .Release.Namespace }} # namespace:cluster
{{- end -}}
{{- end }}
2 changes: 1 addition & 1 deletion deploy/charts/library/templates/_recommended-labels.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ app.kubernetes.io/part-of: rook-ceph-operator
app.kubernetes.io/managed-by: helm
app.kubernetes.io/created-by: helm
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
{{- end -}}
{{- end }}
4 changes: 2 additions & 2 deletions deploy/charts/library/templates/_suffix-cluster-namespace.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ If the cluster namespace is different from the operator namespace, we want to na
{{- $clusterNamespace := .Release.Namespace -}}
{{- if ne $clusterNamespace $operatorNamespace -}}
{{ printf "-%s" $clusterNamespace }}
{{- end -}}
{{- end -}}
{{- end }}
{{- end }}
8 changes: 4 additions & 4 deletions deploy/charts/rook-ceph-cluster/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ Define the clusterName as defaulting to the release namespace
*/}}
{{- define "clusterName" -}}
{{ .Values.clusterName | default .Release.Namespace }}
{{- end -}}
{{- end }}

{{/*
Return the target Kubernetes version.
*/}}
{{- define "capabilities.kubeVersion" -}}
{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
{{- end -}}
{{- end }}

{{/*
Return the appropriate apiVersion for ingress.
Expand All @@ -22,5 +22,5 @@ Return the appropriate apiVersion for ingress.
{{- print "networking.k8s.io/v1beta1" -}}
{{- else -}}
{{- print "networking.k8s.io/v1" -}}
{{- end -}}
{{- end -}}
{{- end }}
{{- end }}
4 changes: 2 additions & 2 deletions deploy/charts/rook-ceph-cluster/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clusterrolebindings
{{- if .Values.pspEnable }}
---
{{ include "library.cluster.psp.rolebindings" . }}
{{- end -}}
{{- end }}

{{/*
roles
Expand All @@ -38,4 +38,4 @@ rolebindings
{{ include "library.cluster.monitoring.rolebindings" . }}
{{- end }}

{{- end -}}
{{- end }}
2 changes: 1 addition & 1 deletion deploy/charts/rook-ceph/templates/cluster-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ clusterrolebindings
{{- if .Values.pspEnable }}
---
{{ include "library.cluster.psp.rolebindings" . }}
{{- end -}}
{{- end }}

{{/*
roles
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/rook-ceph/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -535,4 +535,4 @@ rules:
- apiGroups: [""]
resources: ["serviceaccounts"]
verbs: ["get"]
{{- end -}}
{{- end }}
2 changes: 1 addition & 1 deletion deploy/charts/rook-ceph/templates/clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ roleRef:
kind: ClusterRole
name: rbd-external-provisioner-runner
apiGroup: rbac.authorization.k8s.io
{{- end -}}
{{- end }}
2 changes: 1 addition & 1 deletion deploy/charts/rook-ceph/templates/psp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,4 +168,4 @@ subjects:
name: rook-csi-rbd-provisioner-sa
namespace: {{ .Release.Namespace }} # namespace:operator
{{- end }}
{{- end -}}
{{- end }}
4 changes: 2 additions & 2 deletions deploy/charts/rook-ceph/templates/rolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ roleRef:
name: rbd-csi-nodeplugin
apiGroup: rbac.authorization.k8s.io
---
{{- end -}}
{{- end }}
kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand All @@ -61,4 +61,4 @@ roleRef:
kind: Role
name: rbd-external-provisioner-cfg
apiGroup: rbac.authorization.k8s.io
{{- end -}}
{{- end }}

0 comments on commit b1a0918

Please sign in to comment.