add configurable ceph users

elemental-lf · Mar 28, 2023 · 241eca4 · 241eca4
1 parent 7f41268
commit 241eca4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/charts/benji/templates/_helpers.tpl b/charts/benji/templates/_helpers.tpl
@@ -45,9 +45,20 @@ Create hostname:port pair pointing to the Prometheus pushgateway
 {{- end -}}
 
 {{/*
-ceph client admin keyring
+ceph conf
+*/}}
+{{- define "benji.ceph-conf" -}}
+[global]
+mon_host = {{ .Values.ceph.mon_hosts }}
+
+[client.{{ .Values.ceph.user | default "admin" }}]
+keyring = /etc/ceph/keyring
+{{ end -}}
+
+{{/*
+ceph client keyring
 */}}
 {{- define "benji.ceph-keyring" -}}
-[client.admin]
+[client.{{ .Values.ceph.user | default "admin" }}]
 key = {{ .Values.ceph.key }}
 {{ end -}}
diff --git a/charts/benji/templates/cron-jobs.yaml b/charts/benji/templates/cron-jobs.yaml
@@ -66,6 +66,10 @@ spec:
 {{- if $.Values.pushgateway.enabled }}
                 - name: PROM_PUSH_GATEWAY
                   value: "{{ include "benji.pushgateway" $ }}"
+{{- end }}
+{{- with $.Values.ceph.user }}
+                - name: CEPH_ARGS
+                  value: "--name client.{{ . }}"
 {{- end }}
                 - name: TZ
                   value: "{{ $.Values.timeZone }}"

diff --git a/charts/benji/templates/maint-deployment.yaml b/charts/benji/templates/maint-deployment.yaml
@@ -49,6 +49,10 @@ spec:
 {{- if .Values.pushgateway.enabled }}
             - name: PROM_PUSH_GATEWAY
               value: "{{ include "benji.pushgateway" $ }}"
+{{- end }}
+{{- with .Values.ceph.user }}
+            - name: CEPH_ARGS
+              value: "--name client.{{ . }}"
 {{- end }}
             - name: TZ
               value: "{{ .Values.timeZone }}"

diff --git a/charts/benji/values.yaml b/charts/benji/values.yaml
@@ -181,5 +181,5 @@ pushgateway:
   nameOverride: pushgateway
   service:
     port: 9091
-        
+
 ceph: {}