443ff3e3e3
This change converts the readiness and liveness probes in the Ceph charts to use the functions from the Helm toolkit rather than having hard-coded probe definitions. This allows probe configs to be overridden in values.yaml without rebuilding charts. Change-Id: I68a01b518f12d33fe4f87f86494a5f4e19be982e
209 lines
8.7 KiB
YAML
209 lines
8.7 KiB
YAML
{{/*
|
|
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.
|
|
*/}}
|
|
|
|
{{- define "mgrLivenessProbeTemplate" -}}
|
|
exec:
|
|
command:
|
|
- /tmp/mgr-check.sh
|
|
{{- end }}
|
|
|
|
{{- define "mgrReadinessProbeTemplate" -}}
|
|
exec:
|
|
command:
|
|
- /tmp/mgr-check.sh
|
|
{{- end }}
|
|
|
|
{{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }}
|
|
{{- $envAll := . }}
|
|
|
|
{{- $serviceAccountName := "ceph-mgr" }}
|
|
# This protective IF prevents an attempt of repeated creation
|
|
# of ceph-mgr service account.
|
|
# To be considered: the separation of SA and Deployment manifests.
|
|
{{- if .Values.manifests.deployment_mgr_sa }}
|
|
{{ tuple $envAll "mgr" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
|
{{- end }}
|
|
---
|
|
kind: Deployment
|
|
apiVersion: apps/v1
|
|
metadata:
|
|
name: ceph-mgr
|
|
annotations:
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
|
|
labels:
|
|
{{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
|
spec:
|
|
replicas: {{ .Values.pod.replicas.mgr }}
|
|
selector:
|
|
matchLabels:
|
|
{{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
|
|
strategy:
|
|
type: {{ .Values.pod.updateStrategy.mgr.type }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
annotations:
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
{{ dict "envAll" $envAll "podName" "ceph-mgr" "containerNames" (list "ceph-mgr" "ceph-init-dirs") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
|
|
spec:
|
|
{{ dict "envAll" $envAll "application" "mgr" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
|
|
serviceAccountName: {{ $serviceAccountName }}
|
|
affinity:
|
|
{{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
|
{{ tuple $envAll "mgr" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
|
|
nodeSelector:
|
|
{{ .Values.labels.mgr.node_selector_key }}: {{ .Values.labels.mgr.node_selector_value }}
|
|
hostNetwork: true
|
|
hostPID: true
|
|
dnsPolicy: {{ .Values.pod.dns_policy }}
|
|
initContainers:
|
|
{{ tuple $envAll "mgr" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
- name: ceph-init-dirs
|
|
{{ tuple $envAll "ceph_mgr" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ dict "envAll" $envAll "application" "mgr" "container" "init_dirs" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
command:
|
|
- /tmp/init-dirs.sh
|
|
env:
|
|
- name: CLUSTER
|
|
value: "ceph"
|
|
volumeMounts:
|
|
- name: pod-tmp
|
|
mountPath: /tmp
|
|
- name: pod-run
|
|
mountPath: /run
|
|
- name: pod-etc-ceph
|
|
mountPath: /etc/ceph
|
|
- name: ceph-mon-bin
|
|
mountPath: /tmp/init-dirs.sh
|
|
subPath: init-dirs.sh
|
|
readOnly: true
|
|
- name: pod-var-lib-ceph
|
|
mountPath: /var/lib/ceph
|
|
readOnly: false
|
|
- name: pod-var-lib-ceph-crash
|
|
mountPath: /var/lib/ceph/crash
|
|
readOnly: false
|
|
containers:
|
|
- name: ceph-mgr
|
|
{{ tuple $envAll "ceph_mgr" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
{{ dict "envAll" $envAll "application" "mgr" "container" "mgr" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
env:
|
|
- name: CLUSTER
|
|
value: "ceph"
|
|
- name: NAMESPACE
|
|
valueFrom:
|
|
fieldRef:
|
|
apiVersion: v1
|
|
fieldPath: metadata.namespace
|
|
- name: MON_PORT
|
|
value: {{ tuple "ceph_mon" "internal" "mon" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
|
- name: MON_PORT_V2
|
|
value: {{ tuple "ceph_mon" "internal" "mon_msgr2" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
|
{{- if .Values.ceph_mgr_enabled_modules }}
|
|
- name: ENABLED_MODULES
|
|
value: |-
|
|
{{- range $value := .Values.ceph_mgr_enabled_modules }}
|
|
{{ $value }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.ceph_mgr_modules_config }}
|
|
{{- range $module,$params := .Values.ceph_mgr_modules_config }}
|
|
{{- range $key, $value := $params }}
|
|
- name: {{ $module }}_{{ $key }}
|
|
value: {{ $value | quote }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
command:
|
|
- /mgr-start.sh
|
|
ports:
|
|
- name: mgr
|
|
containerPort: {{ tuple "ceph_mgr" "internal" "mgr" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
{{- if (has "prometheus" .Values.ceph_mgr_enabled_modules) }}
|
|
- name: metrics
|
|
containerPort: {{ tuple "ceph_mgr" "internal" "metrics" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
{{ end -}}
|
|
volumeMounts:
|
|
- name: pod-tmp
|
|
mountPath: /tmp
|
|
- name: pod-run
|
|
mountPath: /run
|
|
- name: pod-etc-ceph
|
|
mountPath: /etc/ceph
|
|
- name: ceph-mon-bin
|
|
mountPath: /mgr-start.sh
|
|
subPath: mgr-start.sh
|
|
readOnly: true
|
|
- name: ceph-mon-bin
|
|
mountPath: /tmp/mgr-check.sh
|
|
subPath: mgr-check.sh
|
|
readOnly: true
|
|
- name: ceph-mon-etc
|
|
mountPath: /etc/ceph/ceph.conf.template
|
|
subPath: ceph.conf
|
|
readOnly: true
|
|
- name: ceph-mon-admin-keyring
|
|
mountPath: /etc/ceph/ceph.client.admin.keyring
|
|
subPath: ceph.client.admin.keyring
|
|
readOnly: true
|
|
- name: ceph-bootstrap-mgr-keyring
|
|
mountPath: /var/lib/ceph/bootstrap-mgr/ceph.keyring
|
|
subPath: ceph.keyring
|
|
readOnly: false
|
|
- name: pod-var-lib-ceph
|
|
mountPath: /var/lib/ceph
|
|
readOnly: false
|
|
- name: pod-var-lib-ceph-crash
|
|
mountPath: /var/lib/ceph/crash
|
|
readOnly: false
|
|
- name: ceph-mon-bin
|
|
mountPath: /tmp/utils-checkPGs.py
|
|
subPath: utils-checkPGs.py
|
|
readOnly: true
|
|
{{ dict "envAll" . "component" "ceph" "container" "ceph-mgr" "type" "liveness" "probeTemplate" (include "mgrLivenessProbeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
|
{{ dict "envAll" . "component" "ceph" "container" "ceph-mgr" "type" "readiness" "probeTemplate" (include "mgrReadinessProbeTemplate" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
|
|
volumes:
|
|
- name: pod-tmp
|
|
emptyDir: {}
|
|
- name: pod-run
|
|
emptyDir:
|
|
medium: "Memory"
|
|
- name: pod-etc-ceph
|
|
emptyDir: {}
|
|
- name: ceph-mon-bin
|
|
configMap:
|
|
name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
|
|
defaultMode: 0555
|
|
- name: ceph-mon-etc
|
|
configMap:
|
|
name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
|
|
defaultMode: 0444
|
|
- name: pod-var-lib-ceph
|
|
emptyDir: {}
|
|
- name: pod-var-lib-ceph-crash
|
|
hostPath:
|
|
path: /var/lib/openstack-helm/ceph/crash
|
|
type: DirectoryOrCreate
|
|
- name: ceph-mon-admin-keyring
|
|
secret:
|
|
secretName: {{ .Values.secrets.keyrings.admin }}
|
|
- name: ceph-bootstrap-mgr-keyring
|
|
secret:
|
|
secretName: {{ .Values.secrets.keyrings.mgr }}
|
|
{{- end }}
|