Skip to content

helm-chart: Improve templates #1555

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 10, 2025
Merged

helm-chart: Improve templates #1555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions charts/fluent-operator/templates/NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Thank you for installing {{ .Chart.Name }}
Your release is named {{ .Release.Name }}
Your release is named {{ .Release.Name }}

To learn more about the release ,try:
$ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
$ helm get {{ .Release.Name }} -n {{ .Release.Namespace }}
To learn more about the release, try:

$ helm status {{ .Release.Name }} -n {{ .Release.Namespace }}
$ helm get {{ .Release.Name }} -n {{ .Release.Namespace }}
4 changes: 2 additions & 2 deletions charts/fluent-operator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ helm.sh/chart: {{ include "fluent-operator.chart" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
{{- end }}

{{/*
Selector labels
*/}}
{{- define "fluent-operator.selectorLabels" -}}
app.kubernetes.io/name: {{ include "fluent-operator.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
{{- end }}

{{/*
Expand Down
4 changes: 2 additions & 2 deletions charts/fluent-operator/templates/fluent-operator-clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ roleRef:
subjects:
- kind: ServiceAccount
name: fluent-operator
namespace: {{ .Release.Namespace }}
{{- end }}
namespace: {{ .Release.Namespace | quote }}
{{- end }}
38 changes: 19 additions & 19 deletions charts/fluent-operator/templates/fluent-operator-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
app.kubernetes.io/component: operator
app.kubernetes.io/name: fluent-operator
annotations:
{{- toYaml .Values.operator.annotations| nindent 4 }}
{{- toYaml .Values.operator.annotations | nindent 4 }}
spec:
selector:
matchLabels:
Expand All @@ -19,12 +19,12 @@ spec:
labels:
app.kubernetes.io/component: operator
app.kubernetes.io/name: fluent-operator
{{- if .Values.operator.labels }}
{{- toYaml .Values.operator.labels | nindent 8 }}
{{- with .Values.operator.labels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.operator.annotations }}
{{- with .Values.operator.annotations }}
annotations:
{{- toYaml .Values.operator.annotations| nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- if eq .Values.containerRuntime "docker" }}
Expand Down Expand Up @@ -90,7 +90,7 @@ spec:
image: {{ .Values.operator.container.repository }}:{{ .Values.operator.container.tag }}
{{- if .Values.operator.securityContext }}
securityContext:
{{ toYaml .Values.operator.securityContext | nindent 10 }}
{{- toYaml .Values.operator.securityContext | nindent 10 }}
{{- end }}
resources:
{{- toYaml .Values.operator.resources | nindent 10 }}
Expand All @@ -111,27 +111,27 @@ spec:
- name: env
mountPath: /fluent-operator
serviceAccountName: fluent-operator
{{- if .Values.operator.priorityClassName }}
priorityClassName: {{ .Values.operator.priorityClassName | quote }}
{{- with .Values.operator.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}
{{- if .Values.operator.imagePullSecrets }}
{{- with .Values.operator.imagePullSecrets }}
imagePullSecrets:
{{ toYaml .Values.operator.imagePullSecrets | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.operator.tolerations }}
{{- with .Values.operator.tolerations }}
tolerations:
{{ toYaml .Values.operator.tolerations | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.operator.nodeSelector }}
{{- with .Values.operator.nodeSelector }}
nodeSelector:
{{ toYaml .Values.operator.nodeSelector | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.operator.affinity }}
{{- with .Values.operator.affinity }}
affinity:
{{ toYaml .Values.operator.affinity | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.operator.podSecurityContext }}
{{- with .Values.operator.podSecurityContext }}
securityContext:
{{ toYaml .Values.operator.podSecurityContext | nindent 8 }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
6 changes: 3 additions & 3 deletions charts/fluent-operator/templates/fluentbit-clusterfilter-containerd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.filter.containerd.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.filter.containerd.enable }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterFilter
metadata:
Expand Down
8 changes: 4 additions & 4 deletions charts/fluent-operator/templates/fluentbit-clusterfilter-kubernetes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.filter.kubernetes.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.filter.kubernetes.enable }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterFilter
metadata:
Expand All @@ -17,7 +17,7 @@ spec:
kubeTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
{{- $params := omit .Values.fluentbit.filter.kubernetes "enable" }}
{{- if .Values.fluentbit.output.stdout.enable }}
{{- $_ := set $params "k8sLoggingExclude" true -}}
{{- $_ := set $params "k8sLoggingExclude" true }}
{{- end }}
{{- with $params }}
{{- . | toYaml | nindent 6 }}
Expand Down
6 changes: 3 additions & 3 deletions charts/fluent-operator/templates/fluentbit-clusterfilter-multiline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.filter.multiline.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.filter.multiline.enable }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterFilter
metadata:
Expand Down
6 changes: 3 additions & 3 deletions charts/fluent-operator/templates/fluentbit-clusterfilter-systemd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.filter.systemd.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.filter.systemd.enable }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterFilter
metadata:
Expand Down
6 changes: 3 additions & 3 deletions charts/fluent-operator/templates/fluentbit-clusterinput-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.input.fluentBitMetrics -}}
{{- if .Values.fluentbit.enable }}
{{- with .Values.fluentbit.input.fluentBitMetrics }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterInput
metadata:
Expand All @@ -9,6 +9,6 @@ metadata:
fluentbit.fluent.io/component: logging
spec:
fluentBitMetrics:
{{ toYaml .Values.fluentbit.input.fluentBitMetrics | indent 4}}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
8 changes: 4 additions & 4 deletions charts/fluent-operator/templates/fluentbit-clusterinput-nodeExporterMetrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.input.nodeExporterMetrics -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- with .Values.fluentbit.input.nodeExporterMetrics }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterInput
metadata:
Expand All @@ -10,7 +10,7 @@ metadata:
fluentbit.fluent.io/component: logging
spec:
nodeExporterMetrics:
{{ toYaml .Values.fluentbit.input.nodeExporterMetrics | indent 4}}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
16 changes: 8 additions & 8 deletions charts/fluent-operator/templates/fluentbit-clusterinput-systemd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.input.systemd.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.input.systemd.enable }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterInput
metadata:
Expand All @@ -11,20 +11,20 @@ metadata:
spec:
systemd:
tag: service.*
path: {{ .Values.fluentbit.input.systemd.path }}
path: {{ .Values.fluentbit.input.systemd.path | quote }}
db: /fluent-bit/tail/systemd.db
dbSync: Normal
stripUnderscores: {{ .Values.fluentbit.input.systemd.stripUnderscores | quote }}
systemdFilter:
{{- if .Values.fluentbit.input.systemd.systemdFilter.enable }}
{{- if .Values.fluentbit.input.systemd.systemdFilter.enable }}
- _SYSTEMD_UNIT={{ .Values.containerRuntime }}.service
{{- if .Values.fluentbit.input.systemd.includeKubelet }}
- _SYSTEMD_UNIT=kubelet.service
{{- end }}
{{- if .Values.fluentbit.input.systemd.systemdFilter.filters }}
{{- toYaml .Values.fluentbit.input.systemd.systemdFilter.filters | nindent 6 }}
{{- with .Values.fluentbit.input.systemd.systemdFilter.filters }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}
{{- end }}
storageType: {{ .Values.fluentbit.input.systemd.storageType }}
{{- if eq .Values.fluentbit.input.systemd.storageType "filesystem" }}
pauseOnChunksOverlimit: {{ .Values.fluentbit.input.systemd.pauseOnChunksOverlimit | quote }}
Expand Down
16 changes: 8 additions & 8 deletions charts/fluent-operator/templates/fluentbit-clusterinput-tail.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.input.tail.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.input.tail.enable }}
apiVersion: fluentbit.fluent.io/v1alpha2
kind: ClusterInput
metadata:
Expand All @@ -11,7 +11,7 @@ metadata:
spec:
tail:
tag: kube.*
path: {{ .Values.fluentbit.input.tail.path }}
path: {{ .Values.fluentbit.input.tail.path | quote }}
readFromHead: {{ .Values.fluentbit.input.tail.readFromHead }}
{{- if eq .Values.containerRuntime "docker" }}
parser: docker
Expand All @@ -20,13 +20,13 @@ spec:
{{- else if eq .Values.containerRuntime "crio" }}
parser: cri
{{- end }}
{{- if .Values.fluentbit.input.tail.multilineParser }}
multilineParser: {{ .Values.fluentbit.input.tail.multilineParser | quote }}
{{- with .Values.fluentbit.input.tail.multilineParser }}
multilineParser: {{ . | quote }}
{{- end }}
refreshIntervalSeconds: {{ .Values.fluentbit.input.tail.refreshIntervalSeconds }}
memBufLimit: {{ .Values.fluentbit.input.tail.memBufLimit }}
{{- if .Values.fluentbit.input.tail.bufferMaxSize }}
bufferMaxSize: {{ .Values.fluentbit.input.tail.bufferMaxSize }}
{{- with .Values.fluentbit.input.tail.bufferMaxSize }}
bufferMaxSize: {{ . | quote }}
{{- end }}
skipLongLines: {{ .Values.fluentbit.input.tail.skipLongLines }}
db: /fluent-bit/tail/pos.db
Expand Down
6 changes: 3 additions & 3 deletions charts/fluent-operator/templates/fluentbit-containerd-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{- if .Values.Kubernetes -}}
{{- if .Values.fluentbit.enable -}}
{{- if .Values.fluentbit.filter.containerd.enable -}}
{{- if .Values.Kubernetes }}
{{- if .Values.fluentbit.enable }}
{{- if .Values.fluentbit.filter.containerd.enable }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down
Loading