From 17353d57b0cbab56680e9f73a64ebb8b4d094d2b Mon Sep 17 00:00:00 2001 From: irizzant Date: Fri, 8 May 2020 08:36:41 +0200 Subject: [PATCH] [bitnami/fluentd] Add Istio compatibility (#2463) * Add Istio compatibility * Bump chart version Signed-off-by: Ivan Rizzante * Fix port name Signed-off-by: Ivan Rizzante * Fix missing ports in manifests Signed-off-by: Ivan Rizzante * Adjust chart version to a minor change Signed-off-by: Ivan Rizzante * Add version label to all manifests Signed-off-by: Ivan Rizzante * [bitnami/fluentd] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Ivan Rizzante Co-authored-by: Bitnami Containers --- bitnami/fluentd/Chart.yaml | 2 +- .../templates/aggregator-statefulset.yaml | 8 ++++- bitnami/fluentd/templates/aggregator-svc.yaml | 32 ------------------- .../templates/forwarder-daemonset.yaml | 8 ++++- bitnami/fluentd/templates/forwarder-svc.yaml | 3 +- bitnami/fluentd/templates/metrics-svc.yaml | 4 +-- bitnami/fluentd/templates/svc-headless.yaml | 1 + bitnami/fluentd/values-production.yaml | 16 +++++++--- bitnami/fluentd/values.yaml | 16 +++++++--- 9 files changed, 42 insertions(+), 48 deletions(-) delete mode 100644 bitnami/fluentd/templates/aggregator-svc.yaml diff --git a/bitnami/fluentd/Chart.yaml b/bitnami/fluentd/Chart.yaml index 6a178820b1..4accef4442 100644 --- 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: diff --git a/bitnami/fluentd/templates/aggregator-statefulset.yaml b/bitnami/fluentd/templates/aggregator-statefulset.yaml index 40957cf280..252a7b04c3 100644 --- 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 }} diff --git a/bitnami/fluentd/templates/aggregator-svc.yaml b/bitnami/fluentd/templates/aggregator-svc.yaml deleted file mode 100644 index 4ae43793a4..0000000000 --- a/bitnami/fluentd/templates/aggregator-svc.yaml +++ /dev/null @@ -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 }} \ No newline at end of file diff --git a/bitnami/fluentd/templates/forwarder-daemonset.yaml b/bitnami/fluentd/templates/forwarder-daemonset.yaml index 7c6e44df67..1d9202e585 100644 --- 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 }} diff --git a/bitnami/fluentd/templates/forwarder-svc.yaml b/bitnami/fluentd/templates/forwarder-svc.yaml index a47d37b80c..9181293661 100644 --- 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 }} \ No newline at end of file +{{- end }} diff --git a/bitnami/fluentd/templates/metrics-svc.yaml b/bitnami/fluentd/templates/metrics-svc.yaml index 2b0c92f1d4..e21b2d4023 100644 --- 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 }} diff --git a/bitnami/fluentd/templates/svc-headless.yaml b/bitnami/fluentd/templates/svc-headless.yaml index a64899a4c5..848e20136b 100644 --- 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 diff --git a/bitnami/fluentd/values-production.yaml b/bitnami/fluentd/values-production.yaml index 87f143a462..331d558f69 100644 --- 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: diff --git a/bitnami/fluentd/values.yaml b/bitnami/fluentd/values.yaml index ddb2e32d58..de91e1622f 100644 --- 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: