diff --git a/ceph-client/templates/cronjob-defragosds.yaml b/ceph-client/templates/cronjob-defragosds.yaml index e204eed96..cb2a03482 100644 --- a/ceph-client/templates/cronjob-defragosds.yaml +++ b/ceph-client/templates/cronjob-defragosds.yaml @@ -92,7 +92,7 @@ spec: mountPath: /tmp - name: pod-etc-ceph mountPath: /etc/ceph - - name: ceph-osd-bin + - name: ceph-client-bin mountPath: /tmp/utils-defragOSDs.sh subPath: utils-defragOSDs.sh readOnly: true @@ -103,12 +103,8 @@ spec: emptyDir: {} - name: pod-etc-ceph emptyDir: {} - - name: ceph-osd-bin + - name: ceph-client-bin configMap: - name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }} + name: ceph-client-bin defaultMode: 0555 - - name: ceph-client-etc - configMap: - name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }} - defaultMode: 0444 {{- end }} diff --git a/tools/deployment/osh-infra-logging/020-ceph.sh b/tools/deployment/osh-infra-logging/020-ceph.sh index 5ef73e30d..c642c3dcb 100755 --- a/tools/deployment/osh-infra-logging/020-ceph.sh +++ b/tools/deployment/osh-infra-logging/020-ceph.sh @@ -185,7 +185,6 @@ jobs: execPolicy: Forbid startingDeadlineSecs: 60 manifests: - cronjob_defragosds: true job_bootstrap: false EOF