diff --git a/charts-wip/radosgw/templates/_helpers.tpl b/charts-wip/radosgw/templates/_helpers.tpl index f2fc114..e10b9d9 100644 --- a/charts-wip/radosgw/templates/_helpers.tpl +++ b/charts-wip/radosgw/templates/_helpers.tpl @@ -50,7 +50,7 @@ Generate a CEPH keyring file, suitable for base64 encoding {{- define "radosgw.keyringFile" -}} [client.{{ .Client }}] key = {{ .Key }} -{{- end --} +{{- end -}} {{/* Helper for joining a list diff --git a/charts-wip/radosgw/templates/statefulset.yaml b/charts-wip/radosgw/templates/statefulset.yaml index c71cc46..274be68 100644 --- a/charts-wip/radosgw/templates/statefulset.yaml +++ b/charts-wip/radosgw/templates/statefulset.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -24,7 +25,10 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} containers: - - name: {{ .Chart.Name }} + - env: + - name: CEPH_DAEMON + value: RGW + name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: @@ -42,15 +46,15 @@ spec: resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: - - mountPath:/etc/ceph/ceph.conf + - mountPath: /etc/ceph/ceph.conf name: ceph-conf subPath: ceph.conf readOnly: true - - mountPath:/etc/ceph/ceph.client.admin.keyring + - mountPath: /etc/ceph/ceph.client.admin.keyring name: ceph-keyring subPath: client.admin.keyring readOnly: true - - mountPath:/var/lib/ceph/bootstrap-rgw.keyring + - mountPath: /var/lib/ceph/bootstrap-rgw.keyring name: ceph-keyring subPath: bootstrap-rgw.keyring readOnly: true diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml index eae8791..afdc94c 100644 --- a/charts/netbox/templates/deployment.yaml +++ b/charts/netbox/templates/deployment.yaml @@ -65,6 +65,7 @@ spec: httpGet: port: http path: / + initialDelaySeconds: 30 readinessProbe: httpGet: port: http