Fluent-Logging: Update fluent-bit to use common OSH entrypoint pattern

This PS updates the fluent-logging chart to use the same entrypoint
pattern as other OSH components.

Change-Id: I3bf9baf9824e1b7f7e46c4fcae292240566d9153
This commit is contained in:
portdirect 2017-12-17 09:18:48 -05:00 committed by Pete Birley
parent c189522fdb
commit 611a78fb34
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,21 @@
#!/bin/sh
{{/*
Copyright 2017 The Openstack-Helm Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
set -ex
exec /fluent-bit/bin/fluent-bit -c /fluent-bit/etc/fluent-bit.conf

View File

@ -24,6 +24,8 @@ metadata:
data: data:
fluentd.sh: | fluentd.sh: |
{{ tuple "bin/_fluentd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_fluentd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
fluent-bit.sh: |
{{ tuple "bin/_fluent-bit.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
helm-tests.sh: | helm-tests.sh: |
{{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{ tuple "bin/_helm-tests.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
image-repo-sync.sh: |+ image-repo-sync.sh: |+

View File

@ -51,7 +51,13 @@ spec:
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 }}
command:
- /tmp/fluent-bit.sh
volumeMounts: volumeMounts:
- name: fluent-logging-bin
mountPath: /tmp/fluent-bit.sh
subPath: fluent-bit.sh
readOnly: true
- name: varlog - name: varlog
mountPath: /var/log mountPath: /var/log
- name: varlibdockercontainers - name: varlibdockercontainers
@ -74,6 +80,10 @@ spec:
- name: varlibdockercontainers - name: varlibdockercontainers
hostPath: hostPath:
path: /var/lib/docker/containers path: /var/lib/docker/containers
- name: fluent-logging-bin
configMap:
name: fluent-logging-bin
defaultMode: 0555
- name: fluent-logging-etc - name: fluent-logging-etc
configMap: configMap:
name: fluent-logging-etc name: fluent-logging-etc