Merge branch 'fluent:master' into http

fluent · Sep 4, 2023 · b310057 · b310057
2 parents d6eeda1 + 76b5297
commit b310057
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/charts/fluent-operator/Chart.yaml b/charts/fluent-operator/Chart.yaml
@@ -15,7 +15,7 @@ description: A Helm chart for Kubernetes
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.4.1
+version: 2.4.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/fluent-operator/templates/fluentbit-output-loki.yaml b/charts/fluent-operator/templates/fluentbit-output-loki.yaml
@@ -15,13 +15,13 @@ When these keys are objects, they specify a secret to use generated elsewhere, a
 {{ range $k, $v := dict $userSecret .httpUser $passSecret .httpPassword $tenantIDSecret .tenantID -}}
 {{ if kindIs "string" $v -}}
 ---
-secretapiVersion: v1
+apiVersion: v1
 kind: Secret
 metadata:
   name: {{ $k |quote }}
 type: Opaque
 data:
-  value: {{ $v | quote }}
+  value: {{ $v | b64enc | quote }}
 {{ end -}}
 {{ end -}}
 
@@ -117,4 +117,4 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/fluent-operator/templates/fluentd-clusterfluentdconfig.yaml b/charts/fluent-operator/templates/fluentd-clusterfluentdconfig.yaml
@@ -8,9 +8,7 @@ metadata:
     config.fluentd.fluent.io/enabled: "true"
 spec:
   watchedNamespaces:
-  {{- range .Values.fluentd.watchedNamespaces }}
-  - {{ . }}
-  {{- end }}
+    {{- toYaml .Values.fluentd.watchedNamespaces | nindent 4 }}
   clusterFilterSelector:
     matchLabels:
       filter.fluentd.fluent.io/enabled: "true"

diff --git a/charts/fluent-operator/templates/fluentd-fluentd.yaml b/charts/fluent-operator/templates/fluentd-fluentd.yaml
@@ -29,6 +29,9 @@ spec:
   {{- if .Values.fluentd.logLevel }}
   logLevel: {{ .Values.fluentd.logLevel }}
   {{- end }}
+  {{- with .Values.fluentd.priorityClassName }}
+  priorityClassName: {{ . }}
+  {{- end }}
   {{- if .Values.fluentd.extras }}
   {{ .Values.fluentd.extras | toYaml | nindent 2 }}
   {{- end }}

diff --git a/charts/fluent-operator/values.yaml b/charts/fluent-operator/values.yaml
@@ -363,6 +363,7 @@ fluentd:
   imagePullSecrets: []
   # - name: "image-pull-secret"
   logLevel: ""
+  priorityClassName: ""
   extras: {}
   # Configure the output plugin parameter in Fluentd.
   # Fluentd is disabled by default, if you enable it make sure to also set up an output to use.