fixes according to suggestions

Signed-off-by: Kirill Thirteen <kirill_peretrukhin@epam.com>
fluent · Jun 27, 2023 · d7388ae · d7388ae
1 parent 9609612
commit d7388ae
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -23,4 +23,4 @@ maintainers:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: "Add ability to use existing SecurityContextConstraints in OpenShift, for the fluent-bit chart."
+      description: "Added support for using an existing SecurityContextConstraints for OpenShift."
diff --git a/charts/fluent-bit/templates/_helpers.tpl b/charts/fluent-bit/templates/_helpers.tpl
@@ -129,10 +129,10 @@ autoscaling/v2
 {{/*
 Create the name of OpenShift SecurityContextConstraints to use
 */}}
-{{- define "fluent-bit.openShift.securityContextConstraints.name" -}}
-{{- if .Values.openShift.securityContextConstraints.create -}}
-  {{ default (include "fluent-bit.fullname" .) .Values.openShift.securityContextConstraints.name }}
-{{- else if .Values.openShift.securityContextConstraints.existingName -}}
-  {{- printf "%s" .Values.openShift.securityContextConstraints.existingName -}}
+{{- define "fluent-bit.openShiftSccName" -}}
+{{- if not .Values.openShift.securityContextConstraints.create -}}
+{{- printf "%s" .Values.openShift.securityContextConstraints.existingName -}}
+{{- else -}}
+{{- printf "%s" default (include "fluent-bit.fullname" .) .Values.openShift.securityContextConstraints.name -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/fluent-bit/templates/clusterrole.yaml b/charts/fluent-bit/templates/clusterrole.yaml
@@ -35,7 +35,7 @@ rules:
     resources:
       - securitycontextconstraints
     resourceNames:
-      - {{ include "fluent-bit.openShift.securityContextConstraints.name" . }}
+      - {{ include "fluent-bit.openShiftSccName" . }}
     verbs:
       - use
   {{- end }}

diff --git a/charts/fluent-bit/templates/scc.yaml b/charts/fluent-bit/templates/scc.yaml
@@ -2,7 +2,7 @@
 apiVersion: security.openshift.io/v1
 kind: SecurityContextConstraints
 metadata:
-  name: {{ include "fluent-bit.openShift.securityContextConstraints.name" . }}
+  name: {{ include "fluent-bit.openShiftSccName" . }}
   labels:
     {{- include "fluent-bit.labels" . | nindent 4 }}
   {{- with .Values.openShift.securityContextConstraints.annotations }}