Skip to content
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

feat(fluentd): add support for templating volumes and initcontainers #372

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat(fluentd): add support for templating volumes and initcontainers #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4a7050
feat(fluentd): add support for templating volumes and initcontainers
Boojapho May 31, 2023
92760da
Merge branch 'main' into fluentd-template-volumes
Boojapho Jun 1, 2023
a3daa99
feat(fluentd): add template to podannotations
Boojapho Jun 1, 2023
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
2 changes: 1 addition & 1 deletion charts/fluentd/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: fluentd
description: A Helm chart for Kubernetes
# type: application
version: 0.4.3
version: 0.4.4
appVersion: v1.15.2
icon: https://www.fluentd.org/images/miscellany/fluentd-logo_2x.png
home: https://www.fluentd.org/
Expand Down
10 changes: 5 additions & 5 deletions charts/fluentd/templates/_pod.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ terminationGracePeriodSeconds: {{ . }}
{{- end }}
{{- with .Values.initContainers }}
initContainers:
{{- toYaml . | nindent 2 }}
{{- tpl (ternary . (toYaml .) (kindIs "string" .)) $ | trim | nindent 2 -}}
{{- end }}
containers:
- name: {{ .Chart.Name }}
Expand Down Expand Up @@ -76,8 +76,8 @@ containers:
mountPath: /var/lib/docker/containers
readOnly: true
{{- end }}
{{- if .Values.volumeMounts -}}
{{- toYaml .Values.volumeMounts | nindent 4 }}
{{- with .Values.volumeMounts -}}
{{- tpl (ternary . (toYaml .) (kindIs "string" .)) $ | trim | nindent 4 -}}
{{- end -}}
{{- range $key := .Values.configMapConfigs }}
{{- print "- name: " $key | nindent 4 }}
Expand Down Expand Up @@ -106,8 +106,8 @@ volumes:
hostPath:
path: /var/lib/docker/containers
{{- end }}
{{- if .Values.volumes -}}
{{- toYaml .Values.volumes | nindent 0 }}
{{- with .Values.volumes -}}
{{- tpl (ternary . (toYaml .) (kindIs "string" .)) $ | trim | nindent 0 -}}
{{- end -}}
{{- range $key := .Values.configMapConfigs }}
{{- print "- name: " $key | nindent 0 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluentd/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/fluentd-configurations-cm.yaml") . | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- tpl (ternary . (toYaml .) (kindIs "string" .)) $ | trim | nindent 8 }}
{{- end }}
labels:
{{- include "fluentd.selectorLabels" . | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluentd/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/fluentd-configurations-cm.yaml") . | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- tpl (ternary . (toYaml .) (kindIs "string" .)) $ | trim | nindent 8 }}
{{- end }}
labels:
{{- include "fluentd.selectorLabels" . | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/fluentd/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
annotations:
checksum/config: {{ include (print $.Template.BasePath "/fluentd-configurations-cm.yaml") . | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- tpl (ternary . (toYaml .) (kindIs "string" .)) $ | trim | nindent 8 }}
{{- end }}
labels:
{{- include "fluentd.selectorLabels" . | nindent 8 }}
Expand Down