openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Fluent-logging: use endpoints section and lookups to set port"

Browse Source
This commit is contained in:
Zuul 2018-03-09 01:24:31 +00:00 committed by Gerrit Code Review
commit 7b6f847c4d
5 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fluent-logging/templates/daemonset-fluent-bit.yaml
View File

@ -102,7 +102,6 @@ spec:
{{ tuple $envAll .Values.pod_dependency list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll .Values.pod_dependency list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: fluentbit - name: fluentbit
env:
image: {{ .Values.images.tags.fluentbit }} image: {{ .Values.images.tags.fluentbit }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.fluentbit | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.fluentbit | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}

2
fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -53,7 +53,7 @@ spec:
- start - start
ports: ports:
- name: metrics - name: metrics
containerPort: {{ .Values.network.prometheus_fluentd_exporter.port }} containerPort: {{ tuple "prometheus_fluentd_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
env: env:
- name: FLUENTD_METRICS_HOST - name: FLUENTD_METRICS_HOST
value: {{ $fluentd_metrics_host }} value: {{ $fluentd_metrics_host }}

2
fluent-logging/templates/monitoring/prometheus/exporter-service.yaml
View File

@ -31,7 +31,7 @@ metadata:
spec: spec:
ports: ports:
- name: metrics - name: metrics
port: {{ .Values.network.prometheus_fluentd_exporter.port }} port: {{ tuple "prometheus_fluentd_exporter" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
selector: selector:
{{ tuple $envAll "prometheus_fluentd_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{ tuple $envAll "prometheus_fluentd_exporter" "exporter" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{- end }} {{- end }}

4
fluent-logging/templates/service-fluentd.yaml
View File

@ -24,12 +24,12 @@ metadata:
spec: spec:
ports: ports:
- name: forward - 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 }} {{ if .Values.network.fluentd.node_port.enabled }}
nodePort: {{ .Values.network.fluentd.node_port.port }} nodePort: {{ .Values.network.fluentd.node_port.port }}
{{ end }} {{ end }}
- name: metrics - name: metrics
port: {{ .Values.network.fluentd.port.metrics }} port: {{ tuple "fluentd" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
selector: selector:
{{ tuple $envAll "fluentd" "internal" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} {{ tuple $envAll "fluentd" "internal" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.fluentd.node_port.enabled }} {{ if .Values.network.fluentd.node_port.enabled }}

5
fluent-logging/values.yaml
View File

@ -289,11 +289,6 @@ network:
node_port: node_port:
enabled: false enabled: false
port: 32329 port: 32329
port:
service: 24224
metrics: 24220
prometheus_fluentd_exporter:
port: 9309
pod: pod:
affinity: affinity: