Remove tini from ceph-osd chart
Removing tini from ceph daemon as this didn't resolve an issue with log runner process as will be resolved in another change in post-apply job. Change-Id: I4ebb1d12e736d387e6e34354619a532dd50dfeae
This commit is contained in:
parent
daff3cbdea
commit
9c55663c87
@ -15,6 +15,6 @@ apiVersion: v1
|
||||
appVersion: v1.0.0
|
||||
description: OpenStack-Helm Ceph OSD
|
||||
name: ceph-osd
|
||||
version: 0.1.53
|
||||
version: 0.1.54
|
||||
home: https://github.com/ceph/ceph
|
||||
...
|
||||
|
@ -315,11 +315,8 @@ spec:
|
||||
value: {{ .Values.logging.truncate.period | quote }}
|
||||
- name: WAIT_FOR_OSD_ID_TIMEOUT
|
||||
value: {{ .Values.logging.osd_id.timeout | quote }}
|
||||
{{- if .Values.conf.tini.log_runner.enabled }}
|
||||
command: ["/usr/local/bin/tini", "--", "/tmp/log-tail.sh"]
|
||||
{{- else }}
|
||||
command: ["/tmp/log-tail.sh"]
|
||||
{{- end }}
|
||||
command:
|
||||
- /tmp/log-tail.sh
|
||||
volumeMounts:
|
||||
- name: pod-tmp
|
||||
mountPath: /tmp
|
||||
@ -360,11 +357,8 @@ spec:
|
||||
value: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
||||
- name: MON_PORT_V2
|
||||
value: {{ tuple "ceph_mon" "internal" "mon_msgr2" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
||||
{{- if .Values.conf.tini.ceph_osd_default.enabled }}
|
||||
command: ["/usr/local/bin/tini", "--", "/tmp/osd-start.sh"]
|
||||
{{- else }}
|
||||
command: ["/tmp/osd-start.sh"]
|
||||
{{- end }}
|
||||
command:
|
||||
- /tmp/osd-start.sh
|
||||
lifecycle:
|
||||
preStop:
|
||||
exec:
|
||||
|
@ -179,11 +179,6 @@ jobs:
|
||||
startingDeadlineSecs: 60
|
||||
|
||||
conf:
|
||||
tini:
|
||||
log_runner:
|
||||
enabled: false
|
||||
ceph_osd_default:
|
||||
enabled: false
|
||||
ceph:
|
||||
global:
|
||||
# auth
|
||||
|
@ -54,4 +54,5 @@ ceph-osd:
|
||||
- 0.1.51 Update Ceph images to patched 18.2.2 and restore debian-reef repo
|
||||
- 0.1.52 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default
|
||||
- 0.1.53 Update ceph-daemon to be able to use tini init system
|
||||
- 0.1.54 Remove use of tini for ceph-daemon
|
||||
...
|
||||
|
Loading…
Reference in New Issue
Block a user