Fluent-logging: use endpoints section and lookups to set port
This PS moves fluent-logging to use the endpoints section and lookups to set the port it serves on. Change-Id: I7cbbd8d6287942eb36f70ae74872405038e523e8
This commit is contained in:
parent
d681396412
commit
417ce3f37b
@ -102,7 +102,6 @@ spec:
|
||||
{{ tuple $envAll .Values.pod_dependency list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||
containers:
|
||||
- name: fluentbit
|
||||
env:
|
||||
image: {{ .Values.images.tags.fluentbit }}
|
||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||
{{ tuple $envAll $envAll.Values.pod.resources.fluentbit | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||
|
@ -53,7 +53,7 @@ spec:
|
||||
- start
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: {{ .Values.network.prometheus_fluentd_exporter.port }}
|
||||
containerPort: {{ tuple "prometheus_fluentd_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
env:
|
||||
- name: FLUENTD_METRICS_HOST
|
||||
value: {{ $fluentd_metrics_host }}
|
||||
|
@ -31,7 +31,7 @@ metadata:
|
||||
spec:
|
||||
ports:
|
||||
- name: metrics
|
||||
port: {{ .Values.network.prometheus_fluentd_exporter.port }}
|
||||
port: {{ tuple "prometheus_fluentd_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
selector:
|
||||
{{ tuple $envAll "prometheus_fluentd_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||
{{- end }}
|
||||
|
@ -24,12 +24,12 @@ metadata:
|
||||
spec:
|
||||
ports:
|
||||
- name: forward
|
||||
port: {{ .Values.network.fluentd.port.service }}
|
||||
port: {{ tuple "fluentd" "internal" "service" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
{{ if .Values.network.fluentd.node_port.enabled }}
|
||||
nodePort: {{ .Values.network.fluentd.node_port.port }}
|
||||
{{ end }}
|
||||
- name: metrics
|
||||
port: {{ .Values.network.fluentd.port.metrics }}
|
||||
port: {{ tuple "fluentd" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
selector:
|
||||
{{ tuple $envAll "fluentd" "internal" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||
{{ if .Values.network.fluentd.node_port.enabled }}
|
||||
|
@ -289,11 +289,6 @@ network:
|
||||
node_port:
|
||||
enabled: false
|
||||
port: 32329
|
||||
port:
|
||||
service: 24224
|
||||
metrics: 24220
|
||||
prometheus_fluentd_exporter:
|
||||
port: 9309
|
||||
|
||||
pod:
|
||||
affinity:
|
||||
|
Loading…
Reference in New Issue
Block a user