ef62e93608
This patch removes unused `/var/cache/cinder` volume that is mounted for each of Cinder services. I suppose it was added to serve as value of `signing_dir` option from keystonemiddleware and is used to cache PKI tokens. We're however never setting the option to that value and the option was deprecated in Ocata, so we should be fine to remove it. In case someone still wanted to use `signing_dir` config option, he can easily confiure it back using config and volumes overrides. Related-Bug: 1702072 Change-Id: I03460151e01293b19a864528561c80cab1a72114
124 lines
4.9 KiB
YAML
124 lines
4.9 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.
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.volume }}
|
|
{{- $mounts_cinder_volume := .Values.mounts.cinder_volume.cinder_volume }}
|
|
{{- $mounts_cinder_volume_init := .Values.mounts.cinder_volume.init_container }}
|
|
---
|
|
apiVersion: apps/v1beta1
|
|
kind: Deployment
|
|
metadata:
|
|
name: cinder-volume
|
|
spec:
|
|
replicas: {{ .Values.replicas.volume }}
|
|
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
|
|
strategy:
|
|
type: {{ .Values.upgrades.pod_replacement_strategy }}
|
|
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
|
|
rollingUpdate:
|
|
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
|
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
|
{{ end }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "cinder" "volume" | 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" "volume" | 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_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
{{- if include "cinder.is_ceph_volume_configured" . }}
|
|
- name: ceph-keyring-placement
|
|
image: {{ .Values.images.volume }}
|
|
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-volume
|
|
image: {{ .Values.images.volume }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{- if .Values.resources.enabled }}
|
|
resources:
|
|
requests:
|
|
memory: {{ .Values.resources.cinder_volume.requests.memory | quote }}
|
|
cpu: {{ .Values.resources.cinder_volume.requests.cpu | quote }}
|
|
limits:
|
|
memory: {{ .Values.resources.cinder_volume.limits.memory | quote }}
|
|
cpu: {{ .Values.resources.cinder_volume.limits.cpu | quote }}
|
|
{{- end }}
|
|
command:
|
|
- /tmp/cinder-volume.sh
|
|
volumeMounts:
|
|
- name: cinder-bin
|
|
mountPath: /tmp/cinder-volume.sh
|
|
subPath: cinder-volume.sh
|
|
readOnly: true
|
|
- name: cinder-etc
|
|
mountPath: /etc/cinder/cinder.conf
|
|
subPath: cinder.conf
|
|
readOnly: true
|
|
- name: cinder-etc
|
|
mountPath: /etc/cinder/conf/backends.conf
|
|
subPath: backends.conf
|
|
readOnly: true
|
|
{{- if include "cinder.is_ceph_volume_configured" . }}
|
|
- 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_volume.volumeMounts }}{{ toYaml $mounts_cinder_volume.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: cinder-bin
|
|
configMap:
|
|
name: cinder-bin
|
|
defaultMode: 0555
|
|
- name: cinder-etc
|
|
configMap:
|
|
name: cinder-etc
|
|
{{- if include "cinder.is_ceph_volume_configured" . }}
|
|
- name: etcceph
|
|
emptyDir: {}
|
|
- name: ceph-etc
|
|
configMap:
|
|
name: ceph-etc
|
|
- name: ceph-keyring
|
|
secret:
|
|
secretName: pvc-ceph-client-key
|
|
{{ end }}
|
|
{{ if $mounts_cinder_volume.volumes }}{{ toYaml $mounts_cinder_volume.volumes | indent 8 }}{{ end }}
|