[bitnami/fluentd] Add Istio compatibility (#2463)

* Add Istio compatibility * Bump chart version Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it> * Fix port name Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it> * Fix missing ports in manifests Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it> * Adjust chart version to a minor change Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it> * Add version label to all manifests Signed-off-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it> * [bitnami/fluentd] Update components versions Signed-off-by: Bitnami Containers <containers@bitnami.com> Co-authored-by: Ivan Rizzante <ivan.rizzante@tech.sdb.it> Co-authored-by: Bitnami Containers <containers@bitnami.com>
2026-02-20 03:58:02 +08:00 · 2020-05-08 08:36:41 +02:00
parent 1e77130204
commit 17353d57b0
9 changed files with 42 additions and 48 deletions
--- a/bitnami/fluentd/Chart.yaml
+++ b/bitnami/fluentd/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: fluentd
-version: 1.0.6
+version: 1.1.4
 appVersion: 1.10.3
 description: Fluentd is an open source data collector for unified logging layer
 keywords:
--- a/bitnami/fluentd/templates/aggregator-statefulset.yaml
+++ b/bitnami/fluentd/templates/aggregator-statefulset.yaml
@@ -5,6 +5,8 @@ metadata:
  name: {{ include "fluentd.fullname" . }}
  labels: {{- include "fluentd.labels" . | nindent 4 }}
    app.kubernetes.io/component: aggregator
+    ## Istio Labels: https://istio.io/docs/ops/deployment/requirements/
+    app: aggregator
 spec:
  selector:
    matchLabels: {{- include "fluentd.matchLabels" . | nindent 6 }}
@@ -16,6 +18,10 @@ spec:
    metadata:
      labels: {{- include "fluentd.labels" . | nindent 8 }}
        app.kubernetes.io/component: aggregator
+        app: aggregator
+        {{- if .Values.aggregator.podLabels }}
+        {{- include "fluentd.tplValue" (dict "value" .Values.aggregator.podLabels "context" $) | nindent 8 }}
+        {{- end }}
      annotations:
        checksum/config: {{ include (print $.Template.BasePath "/aggregator-configmap.yaml") . | sha256sum }}
        {{- if .Values.aggregator.podAnnotations }}
@@ -59,7 +65,7 @@ spec:
            {{- toYaml .Values.aggregator.containerPorts | nindent 12 }}
            {{- end }}
            {{- if .Values.metrics.enabled }}
-            - name: metrics
+            - name: tcp-metrics
              containerPort: {{ .Values.metrics.service.port }}
              protocol: TCP
            {{- end }}
--- a/bitnami/fluentd/templates/aggregator-svc.yaml
+++ b/bitnami/fluentd/templates/aggregator-svc.yaml
@@ -1,32 +0,0 @@
-{{- if and .Values.aggregator.enabled .Values.aggregator.service.ports }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "fluentd.fullname" . }}-aggregator
-  labels: {{- include "fluentd.labels" . | nindent 4 }}
-    app.kubernetes.io/component: aggregator
-  {{- if .Values.aggregator.service.annotations }}
-  annotations: {{- include "fluentd.tplValue" (dict "value" .Values.aggregator.service.annotations "context" $) | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ .Values.aggregator.service.type }}
-  {{- if and .Values.aggregator.service.loadBalancerIP (eq .Values.aggregator.service.type "LoadBalancer") }}
-  loadBalancerIP: {{ .Values.aggregator.service.loadBalancerIP }}
-  {{- end }}
-  {{- if and .Values.aggregator.service.loadBalancerSourceRanges (eq .Values.aggregator.service.type "LoadBalancer") }}
-  loadBalancerSourceRanges:
-  {{- with .Values.aggregator.service.loadBalancerSourceRanges }}
-    {{ toYaml . | nindent 4 }}
-  {{- end }}
-  {{- end }}
-  {{- if and (eq .Values.aggregator.service.type "ClusterIP") .Values.aggregator.service.clusterIP }}
-  clusterIP: {{ .Values.aggregator.service.clusterIP }}
-  {{- end }}
-  ports:
-  {{- range $key, $value := .Values.aggregator.service.ports }}
-    - name: {{ $key }}
-      {{ toYaml $value | nindent 6 }}
-  {{- end }}
-  selector: {{ include "fluentd.matchLabels" . | nindent 4 }}
-    app.kubernetes.io/component: aggregator
-{{- end }}
--- a/bitnami/fluentd/templates/forwarder-daemonset.yaml
+++ b/bitnami/fluentd/templates/forwarder-daemonset.yaml
@@ -5,6 +5,8 @@ metadata:
  name: {{ include "fluentd.fullname" . }}
  labels: {{- include "fluentd.labels" . | nindent 4 }}
    app.kubernetes.io/component: forwarder
+    ## Istio Labels: https://istio.io/docs/ops/deployment/requirements/
+    app: forwarder
 spec:
  selector:
    matchLabels: {{- include "fluentd.matchLabels" . | nindent 6 }}
@@ -14,6 +16,10 @@ spec:
    metadata:
      labels: {{- include "fluentd.labels" . | nindent 8 }}
        app.kubernetes.io/component: forwarder
+        app: forwarder
+        {{- if .Values.forwarder.podLabels }}
+        {{- include "fluentd.tplValue" ( dict "value" $.Values.forwarder.podLabels "context" $ ) | nindent 8 }}
+        {{- end }}
      annotations:
        checksum/config: {{ include (print $.Template.BasePath "/forwarder-configmap.yaml") . | sha256sum }}
        {{- if .Values.forwarder.podAnnotations }}
@@ -57,7 +63,7 @@ spec:
            {{- toYaml .Values.forwarder.containerPorts | nindent 12 }}
            {{- end }}
            {{- if .Values.metrics.enabled }}
-            - name: metrics
+            - name: tcp-metrics
              containerPort: {{ .Values.metrics.service.port }}
              protocol: TCP
            {{- end }}
--- a/bitnami/fluentd/templates/forwarder-svc.yaml
+++ b/bitnami/fluentd/templates/forwarder-svc.yaml
@@ -5,6 +5,7 @@ metadata:
  name: {{ include "fluentd.fullname" . }}-forwarder
  labels: {{- include "fluentd.labels" . | nindent 4 }}
    app.kubernetes.io/component: forwarder
+    app: forwarder
  {{- if .Values.forwarder.service.annotations }}
  annotations: {{- include "fluentd.tplValue" (dict "value" .Values.forwarder.service.annotations "context" $) | nindent 4 }}
  {{- end }}
@@ -29,4 +30,4 @@ spec:
  {{- end }}
  selector: {{ include "fluentd.matchLabels" . | nindent 4 }}
    app.kubernetes.io/component: forwarder
-{{- end }}
+{{- end }}
--- a/bitnami/fluentd/templates/metrics-svc.yaml
+++ b/bitnami/fluentd/templates/metrics-svc.yaml
@@ -4,6 +4,7 @@ kind: Service
 metadata:
  name: {{ include "fluentd.fullname" . }}-metrics
  labels: {{- include "fluentd.labels" . | nindent 4 }}
+    app: metrics
  annotations: {{- include "fluentd.tplValue" (dict "value" .Values.metrics.service.annotations "context" $) | nindent 4 }}
 spec:
  type: {{ .Values.metrics.service.type }}
@@ -11,8 +12,7 @@ spec:
  loadBalancerIP: {{ .Values.metrics.service.loadBalancerIP }}
  {{- end }}
  ports:
-    - name: metrics
+    - name: tcp-metrics
      port: {{ .Values.metrics.service.port }}
-      targetPort: metrics
  selector: {{- include "fluentd.matchLabels" . | nindent 4 }}
 {{- end }}
--- a/bitnami/fluentd/templates/svc-headless.yaml
+++ b/bitnami/fluentd/templates/svc-headless.yaml
@@ -5,6 +5,7 @@ metadata:
  name: {{ include "fluentd.fullname" . }}-headless
  labels: {{- include "fluentd.labels" . | nindent 4 }}
    app.kubernetes.io/component: aggregator
+    app: aggregator
 spec:
  type: ClusterIP
  clusterIP: None
--- a/bitnami/fluentd/values-production.yaml
+++ b/bitnami/fluentd/values-production.yaml
@@ -13,7 +13,7 @@ global: {}
 image:
  registry: docker.io
  repository: bitnami/fluentd
-  tag: 1.10.3-debian-10-r3
+  tag: 1.10.3-debian-10-r7
  ## Specify a imagePullPolicy
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -208,6 +208,9 @@ forwarder:
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
  ##
  podAnnotations: {}
+  
+  ## Extra labels to add to Pod
+  podLabels: {}

 ## Agregator parameters
 ##
@@ -274,10 +277,10 @@ aggregator:
    ## Service ports
    ##
    ports:
-      # http:
-      #   port: 9880
-      #   targetPort: http
-      #   protocol: TCP
+      http:
+        port: 9880
+        targetPort: http
+        protocol: TCP
      tcp:
        port: 24224
        targetPort: tcp
@@ -366,6 +369,9 @@ aggregator:
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
  ##
  podAnnotations: {}
+  
+  ## Extra labels to add to Pod
+  podLabels: {}

  ## Persist data to a persistent volume
  persistence:
--- a/bitnami/fluentd/values.yaml
+++ b/bitnami/fluentd/values.yaml
@@ -13,7 +13,7 @@ global: {}
 image:
  registry: docker.io
  repository: bitnami/fluentd
-  tag: 1.10.3-debian-10-r3
+  tag: 1.10.3-debian-10-r7
  ## Specify a imagePullPolicy
  ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -208,6 +208,9 @@ forwarder:
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
  ##
  podAnnotations: {}
+  
+  ## Extra labels to add to Pod
+  podLabels: {}

 ## Agregator parameters
 ##
@@ -274,10 +277,10 @@ aggregator:
    ## Service ports
    ##
    ports:
-      # http:
-      #   port: 9880
-      #   targetPort: http
-      #   protocol: TCP
+      http:
+        port: 9880
+        targetPort: http
+        protocol: TCP
      tcp:
        port: 24224
        targetPort: tcp
@@ -366,6 +369,9 @@ aggregator:
  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
  ##
  podAnnotations: {}
+  
+  ## Extra labels to add to Pod
+  podLabels: {}

  ## Persist data to a persistent volume
  persistence: