radosgw: Update chart, support civetweb frontend

This commit is contained in:
Alexander Olofsson 2020-03-31 13:14:20 +02:00
parent 17a4c0aab2
commit a8cc487e69
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
7 changed files with 18 additions and 10 deletions

View file

@ -4,4 +4,4 @@ appVersion: "14.2"
description: CEPH RadosGW description: CEPH RadosGW
icon: http://ceph.com/wp-content/uploads/2016/07/Ceph_Logo_Stacked_RGB_120411_fa.png icon: http://ceph.com/wp-content/uploads/2016/07/Ceph_Logo_Stacked_RGB_120411_fa.png
name: radosgw name: radosgw
version: 0.2.1 version: 0.3.0

View file

@ -4,13 +4,18 @@ kind: ConfigMap
metadata: metadata:
name: {{ include "radosgw.fullname" . }} name: {{ include "radosgw.fullname" . }}
labels: labels:
{{ include "radosgw.labels" . | indent 4 }} {{ include "radosgw.labels" . | nindent 4 }}
data: data:
ceph.conf: |+ ceph.conf: |+
[global] [global]
mon_host = {{ include "helm-toolkit.utils.joinListWithComma" .Values.monHosts }} mon_host = {{ include "helm-toolkit.utils.joinListWithComma" .Values.monHosts }}
rgw frontends = beast port=8008 endpoint=0.0.0.0:8080
rgw dns name = {{ .Values.dnsName }} rgw dns name = {{ .Values.dnsName }}
{{- if eq .Values.frontend "beast" }}
rgw frontends = beast port=8008 endpoint=0.0.0.0
{{- else if eq .Values.frontend "civetweb" }}
rgw frontends = civetweb port=8008
{{- end }}
{{- if .Values.extraCephConf }} {{- if .Values.extraCephConf }}
{{ .Values.extraCephConf | indent 4 }}
{{- end -}} {{ .Values.extraCephConf | nindent 4 }}
{{- end }}

View file

@ -9,7 +9,7 @@ kind: Ingress
metadata: metadata:
name: {{ $fullName }} name: {{ $fullName }}
labels: labels:
{{ include "radosgw.labels" . | indent 4 }} {{ include "radosgw.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }} {{- with .Values.ingress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}

View file

@ -4,7 +4,7 @@ kind: Secret
metadata: metadata:
name: {{ include "radosgw.fullname" . }} name: {{ include "radosgw.fullname" . }}
labels: labels:
{{ include "radosgw.labels" . | indent 4 }} {{ include "radosgw.labels" . | nindent 4 }}
data: data:
client.admin.keyring: {{ include "radosgw.keyringFile" (dict "Client" "admin" "Key" .Values.adminKey) | b64enc }} client.admin.keyring: {{ include "radosgw.keyringFile" (dict "Client" "admin" "Key" .Values.adminKey) | b64enc }}
bootstrap-rgw.keyring: {{ include "radosgw.keyringFile" (dict "Client" "bootstrap-rgw" "Key" .Values.bootstrapKey) | b64enc }} bootstrap-rgw.keyring: {{ include "radosgw.keyringFile" (dict "Client" "bootstrap-rgw" "Key" .Values.bootstrapKey) | b64enc }}

View file

@ -3,7 +3,7 @@ kind: Service
metadata: metadata:
name: {{ include "radosgw.fullname" . }} name: {{ include "radosgw.fullname" . }}
labels: labels:
{{ include "radosgw.labels" . | indent 4 }} {{ include "radosgw.labels" . | nindent 4 }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
ports: ports:

View file

@ -4,7 +4,7 @@ kind: StatefulSet
metadata: metadata:
name: {{ include "radosgw.fullname" . }} name: {{ include "radosgw.fullname" . }}
labels: labels:
{{ include "radosgw.labels" . | indent 4 }} {{ include "radosgw.labels" . | nindent 4 }}
spec: spec:
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
selector: selector:

View file

@ -13,9 +13,12 @@ imagePullSecrets: []
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""
# monHosts: [] monHosts: []
dnsName: chart-example.local dnsName: chart-example.local
# The RadosGW frontend to use, either beast or civetweb
frontend: beast
# extraCephConf: |- # extraCephConf: |-
# adminKey: # adminKey: