From e824cd01d38b0071c3c5dc8e210cae8f94d9edb9 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 11 Oct 2021 12:56:44 +0200 Subject: [PATCH] chore: logging version bump --- charts/kubezero-logging/Chart.yaml | 4 ++-- .../charts/fluent-bit/Chart.yaml | 10 +++++---- .../charts/fluent-bit/README.md | 4 ++-- .../charts/fluent-bit/templates/_pod.tpl | 22 ++++++++++++++----- .../charts/fluent-bit/values.yaml | 14 ++++++++++-- .../templates/grafana-dashboards.yaml | 2 +- charts/kubezero-logging/values.yaml | 2 +- 7 files changed, 40 insertions(+), 18 deletions(-) diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index b576803e..5cf02748 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.7.13 +version: 0.7.14 appVersion: 1.6.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -26,6 +26,6 @@ dependencies: version: 0.2.10 condition: fluentd.enabled - name: fluent-bit - version: 0.17.0 + version: 0.19.0 condition: fluent-bit.enabled kubeVersion: ">= 1.18.0" diff --git a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml index ac166d3c..b120cd95 100644 --- a/charts/kubezero-logging/charts/fluent-bit/Chart.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/Chart.yaml @@ -1,9 +1,11 @@ annotations: artifacthub.io/changes: | - - kind: changed - description: "Update image version to v1.8.6." + - kind: added + description: "Support setting initContainers to a string value to enable full templating." + - kind: removed + description: "Don't template initContainers when set to an array." apiVersion: v1 -appVersion: 1.8.6 +appVersion: 1.8.7 description: Fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. home: https://fluentbit.io/ @@ -22,4 +24,4 @@ maintainers: name: fluent-bit sources: - https://github.com/fluent/fluent-bit/ -version: 0.17.0 +version: 0.19.0 diff --git a/charts/kubezero-logging/charts/fluent-bit/README.md b/charts/kubezero-logging/charts/fluent-bit/README.md index c4b61729..0781cac6 100644 --- a/charts/kubezero-logging/charts/fluent-bit/README.md +++ b/charts/kubezero-logging/charts/fluent-bit/README.md @@ -1,4 +1,4 @@ -# Fluent Bit Helm Chart +# Fluent Bit Helm chart [Fluent Bit](https://fluentbit.io) is a fast and lightweight log processor and forwarder or Linux, OSX and BSD family operating systems. @@ -16,7 +16,7 @@ To install a release named `fluent-bit`, run: helm install fluent-bit fluent/fluent-bit ``` -## Chart Values +## Chart values ```sh helm show values fluent/fluent-bit diff --git a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl index d640521e..9c472a33 100644 --- a/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl +++ b/charts/kubezero-logging/charts/fluent-bit/templates/_pod.tpl @@ -1,4 +1,5 @@ {{- define "fluent-bit.pod" -}} +serviceAccountName: {{ include "fluent-bit.serviceAccountName" . }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 2 }} @@ -6,9 +7,10 @@ imagePullSecrets: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} -serviceAccountName: {{ include "fluent-bit.serviceAccountName" . }} +{{- with .Values.podSecurityContext }} securityContext: - {{- toYaml .Values.podSecurityContext | nindent 2 }} + {{- toYaml . | nindent 2 }} +{{- end }} hostNetwork: {{ .Values.hostNetwork }} dnsPolicy: {{ .Values.dnsPolicy }} {{- with .Values.dnsConfig }} @@ -19,14 +21,20 @@ dnsConfig: hostAliases: {{- toYaml . | nindent 2 }} {{- end }} -{{- if .Values.initContainers }} +{{- with .Values.initContainers }} initContainers: - {{- toYaml .Values.initContainers | nindent 2 }} +{{- if kindIs "string" . }} + {{- tpl . $ | nindent 2 }} +{{- else }} + {{- toYaml . | nindent 2 }} +{{- end -}} {{- end }} containers: - name: {{ .Chart.Name }} + {{- with .Values.securityContext }} securityContext: - {{- toYaml .Values.securityContext | nindent 6 }} + {{- toYaml . | nindent 6 }} + {{- end }} image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} {{- if .Values.env }} @@ -60,8 +68,10 @@ containers: {{- toYaml .Values.livenessProbe | nindent 6 }} readinessProbe: {{- toYaml .Values.readinessProbe | nindent 6 }} + {{- with .Values.resources }} resources: - {{- toYaml .Values.resources | nindent 6 }} + {{- toYaml . | nindent 6 }} + {{- end }} volumeMounts: {{- toYaml .Values.volumeMounts | nindent 6 }} {{- range $key, $val := .Values.config.extraFiles }} diff --git a/charts/kubezero-logging/charts/fluent-bit/values.yaml b/charts/kubezero-logging/charts/fluent-bit/values.yaml index a00c2eb6..26f360b6 100644 --- a/charts/kubezero-logging/charts/fluent-bit/values.yaml +++ b/charts/kubezero-logging/charts/fluent-bit/values.yaml @@ -285,9 +285,19 @@ args: [] command: [] +# This supports either a structured array or a templatable string initContainers: [] + +# Array mode +# initContainers: # - name: do-something -# image: busybox -# command: ['do', 'something'] +# image: bitnami/kubectl:1.22 +# command: ['kubectl', 'version'] + +# String mode +# initContainers: |- +# - name: do-something +# image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }} +# command: ['kubectl', 'version'] logLevel: info diff --git a/charts/kubezero-logging/templates/grafana-dashboards.yaml b/charts/kubezero-logging/templates/grafana-dashboards.yaml index b241f388..2cd85135 100644 --- a/charts/kubezero-logging/templates/grafana-dashboards.yaml +++ b/charts/kubezero-logging/templates/grafana-dashboards.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: grafana_dashboard: "1" -{{ include "kubezero-lib.labels" . | indent 4 }} + {{- include "kubezero-lib.labels" . | nindent 4 }} annotations: k8s-sidecar-target-directory: Logging binaryData: diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml index 1d672b69..67d0ad6c 100644 --- a/charts/kubezero-logging/values.yaml +++ b/charts/kubezero-logging/values.yaml @@ -244,7 +244,7 @@ fluent-bit: image: #repository: public.ecr.aws/zero-downtime/fluent-bit - tag: 1.8.7 + tag: 1.8.8 serviceMonitor: enabled: false