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:
SPEARS, DUSTIN (ds443n) 2024-12-04 11:29:09 -05:00
parent daff3cbdea
commit 9c55663c87
4 changed files with 6 additions and 16 deletions

View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Ceph OSD description: OpenStack-Helm Ceph OSD
name: ceph-osd name: ceph-osd
version: 0.1.53 version: 0.1.54
home: https://github.com/ceph/ceph home: https://github.com/ceph/ceph
... ...

View File

@ -315,11 +315,8 @@ spec:
value: {{ .Values.logging.truncate.period | quote }} value: {{ .Values.logging.truncate.period | quote }}
- name: WAIT_FOR_OSD_ID_TIMEOUT - name: WAIT_FOR_OSD_ID_TIMEOUT
value: {{ .Values.logging.osd_id.timeout | quote }} value: {{ .Values.logging.osd_id.timeout | quote }}
{{- if .Values.conf.tini.log_runner.enabled }} command:
command: ["/usr/local/bin/tini", "--", "/tmp/log-tail.sh"] - /tmp/log-tail.sh
{{- else }}
command: ["/tmp/log-tail.sh"]
{{- end }}
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp
mountPath: /tmp mountPath: /tmp
@ -360,11 +357,8 @@ spec:
value: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} value: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: MON_PORT_V2 - name: MON_PORT_V2
value: {{ tuple "ceph_mon" "internal" "mon_msgr2" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }} 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:
command: ["/usr/local/bin/tini", "--", "/tmp/osd-start.sh"] - /tmp/osd-start.sh
{{- else }}
command: ["/tmp/osd-start.sh"]
{{- end }}
lifecycle: lifecycle:
preStop: preStop:
exec: exec:

View File

@ -179,11 +179,6 @@ jobs:
startingDeadlineSecs: 60 startingDeadlineSecs: 60
conf: conf:
tini:
log_runner:
enabled: false
ceph_osd_default:
enabled: false
ceph: ceph:
global: global:
# auth # auth

View File

@ -54,4 +54,5 @@ ceph-osd:
- 0.1.51 Update Ceph images to patched 18.2.2 and restore debian-reef repo - 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.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.53 Update ceph-daemon to be able to use tini init system
- 0.1.54 Remove use of tini for ceph-daemon
... ...