92717bdc72
This removes the fluentbit sidecars from the ceph-mon and ceph-osd charts. Instead, we mount /var/log/ceph as a hostpath, and use the fluentbit daemonset to target the mounted log files instead This also updates the fluentd configuration to better handle the correct configuration type for flush_interval (time vs int), as well as updates the fluentd elasticsearch output values to help address the gate failures resulting from the Elasticsearch bulk endpoints failing Change-Id: If3f2ff6371f267ed72379de25ff463079ba4cddc
56 lines
1.9 KiB
YAML
56 lines
1.9 KiB
YAML
{{/*
|
|
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.
|
|
*/}}
|
|
|
|
{{- define "ceph.osd.configmap.etc" }}
|
|
{{- $configMapName := index . 0 }}
|
|
{{- $envAll := index . 1 }}
|
|
{{- with $envAll }}
|
|
|
|
{{- if empty .Values.conf.ceph.global.mon_host -}}
|
|
{{- $monHost := tuple "ceph_mon" "internal" "mon" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
|
|
{{- $_ := $monHost | set .Values.conf.ceph.global "mon_host" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.ceph.global.mon_addr -}}
|
|
{{- $monPort := tuple "ceph_mon" "internal" "mon" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
{{- $_ := printf ":%s" $monPort | set .Values.conf.ceph.global "mon_addr" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.ceph.global.fsid -}}
|
|
{{- $_ := uuidv4 | set .Values.conf.ceph.global "fsid" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.ceph.osd.cluster_network -}}
|
|
{{- $_ := .Values.network.cluster | set .Values.conf.ceph.osd "cluster_network" -}}
|
|
{{- end -}}
|
|
|
|
{{- if empty .Values.conf.ceph.osd.public_network -}}
|
|
{{- $_ := .Values.network.public | set .Values.conf.ceph.osd "public_network" -}}
|
|
{{- end -}}
|
|
---
|
|
apiVersion: v1
|
|
kind: ConfigMap
|
|
metadata:
|
|
name: {{ $configMapName }}
|
|
data:
|
|
ceph.conf: |
|
|
{{ include "helm-toolkit.utils.to_ini" .Values.conf.ceph | indent 4 }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.manifests.configmap_etc }}
|
|
{{- list "ceph-osd-etc" . | include "ceph.osd.configmap.etc" }}
|
|
{{- end }}
|