fc9677f718
Before this change, there was no ability to append custom volume for any of the services. The reason was a missing new line character, so the templates were formatted like this: - name: pod-shared mountPath: /tmp/pod-shared - mountPath: /tmp/test2 name: test2 Apart from that, for some of the services (mostly job-bootstrap) invalid indentation for custom volumes (and their mounts) was set. Closes-Bug: 1712745 Change-Id: Ib57c76a34c0e28ad9e67ea47d1fc250b17711a42 Signed-off-by: Mateusz Blaszkowski <mateusz.blaszkowski@intel.com>
112 lines
4.3 KiB
YAML
112 lines
4.3 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.deployment_backup }}
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.backup }}
|
|
{{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }}
|
|
{{- $mounts_cinder_backup_init := .Values.pod.mounts.cinder_backup.init_container }}
|
|
---
|
|
apiVersion: apps/v1beta1
|
|
kind: Deployment
|
|
metadata:
|
|
name: cinder-backup
|
|
spec:
|
|
replicas: {{ .Values.pod.replicas.backup }}
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "cinder" "backup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
annotations:
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
spec:
|
|
affinity:
|
|
{{ tuple $envAll "cinder" "backup" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
|
nodeSelector:
|
|
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
|
|
initContainers:
|
|
{{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
{{- if include "cinder.is_ceph_backup_configured" . }}
|
|
- name: ceph-keyring-placement
|
|
image: {{ .Values.images.backup }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
command:
|
|
- /tmp/ceph-keyring.sh
|
|
volumeMounts:
|
|
- name: etcceph
|
|
mountPath: /etc/ceph
|
|
- name: cinder-bin
|
|
mountPath: /tmp/ceph-keyring.sh
|
|
subPath: ceph-keyring.sh
|
|
- name: ceph-keyring
|
|
mountPath: /tmp/client-keyring
|
|
subPath: key
|
|
readOnly: true
|
|
{{ end }}
|
|
containers:
|
|
- name: cinder-backup
|
|
image: {{ .Values.images.backup }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
command:
|
|
- /tmp/cinder-backup.sh
|
|
volumeMounts:
|
|
- name: cinder-bin
|
|
mountPath: /tmp/cinder-backup.sh
|
|
subPath: cinder-backup.sh
|
|
readOnly: true
|
|
- name: cinder-etc
|
|
mountPath: /etc/cinder/cinder.conf
|
|
subPath: cinder.conf
|
|
readOnly: true
|
|
{{- if eq .Values.conf.cinder.default.cinder.backup_driver "cinder.backup.drivers.ceph" }}
|
|
- name: etcceph
|
|
mountPath: /etc/ceph
|
|
- name: ceph-etc
|
|
mountPath: /etc/ceph/ceph.conf
|
|
subPath: ceph.conf
|
|
readOnly: true
|
|
- name: ceph-keyring
|
|
mountPath: /tmp/client-keyring
|
|
subPath: key
|
|
readOnly: true
|
|
{{- end -}}
|
|
{{ if $mounts_cinder_backup.volumeMounts }}{{ toYaml $mounts_cinder_backup.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: cinder-etc
|
|
configMap:
|
|
name: cinder-etc
|
|
defaultMode: 0444
|
|
- name: cinder-bin
|
|
configMap:
|
|
name: cinder-bin
|
|
defaultMode: 0555
|
|
{{- if include "cinder.is_ceph_backup_configured" . }}
|
|
- name: etcceph
|
|
emptyDir: {}
|
|
- name: ceph-etc
|
|
configMap:
|
|
name: ceph-etc
|
|
defaultMode: 0444
|
|
- name: ceph-keyring
|
|
secret:
|
|
secretName: pvc-ceph-client-key
|
|
{{ end }}
|
|
{{ if $mounts_cinder_backup.volumes }}{{ toYaml $mounts_cinder_backup.volumes | indent 8 }}{{ end }}
|
|
{{- end }}
|