Fix some issues in the RadosGW chart

This commit is contained in:
Alexander Olofsson 2019-07-08 09:17:40 +02:00
parent d44ddd2256
commit 3df5e2357f
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
3 changed files with 10 additions and 5 deletions

View file

@ -50,7 +50,7 @@ Generate a CEPH keyring file, suitable for base64 encoding
{{- define "radosgw.keyringFile" -}} {{- define "radosgw.keyringFile" -}}
[client.{{ .Client }}] [client.{{ .Client }}]
key = {{ .Key }} key = {{ .Key }}
{{- end --} {{- end -}}
{{/* {{/*
Helper for joining a list Helper for joining a list

View file

@ -1,3 +1,4 @@
---
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
@ -24,7 +25,10 @@ spec:
{{- toYaml . | nindent 8 }} {{- toYaml . | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }} - env:
- name: CEPH_DAEMON
value: RGW
name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
@ -42,15 +46,15 @@ spec:
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- mountPath:/etc/ceph/ceph.conf - mountPath: /etc/ceph/ceph.conf
name: ceph-conf name: ceph-conf
subPath: ceph.conf subPath: ceph.conf
readOnly: true readOnly: true
- mountPath:/etc/ceph/ceph.client.admin.keyring - mountPath: /etc/ceph/ceph.client.admin.keyring
name: ceph-keyring name: ceph-keyring
subPath: client.admin.keyring subPath: client.admin.keyring
readOnly: true readOnly: true
- mountPath:/var/lib/ceph/bootstrap-rgw.keyring - mountPath: /var/lib/ceph/bootstrap-rgw.keyring
name: ceph-keyring name: ceph-keyring
subPath: bootstrap-rgw.keyring subPath: bootstrap-rgw.keyring
readOnly: true readOnly: true

View file

@ -65,6 +65,7 @@ spec:
httpGet: httpGet:
port: http port: http
path: / path: /
initialDelaySeconds: 30
readinessProbe: readinessProbe:
httpGet: httpGet:
port: http port: http