7f04846c52
This addresses slight issues with the ceph-osd, ceph-provisioners, and ceph-rgw charts. Those issues include: - Remove duplicate test: key in ceph-osd dependencies - Add missing image repo sync job to ceph-provisioner and rgw - Use correct job name for image repo sync dependencies in charts - Remove incorrect keystone service dependency for ceph-rgw, as the keystone jobs are dependent on the keystone service This also updates the ceph-rgw chart to use dynamic dependencies based on whether keystone auth or s3 auth is used Change-Id: Id3b3f289bdd4ca4d1b2e9b6267b12427e422a08d
180 lines
7.3 KiB
YAML
180 lines
7.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 and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }}
|
|
{{- $envAll := . }}
|
|
|
|
{{- $serviceAccountName := "ceph-rgw" }}
|
|
|
|
{{- $_ := set $envAll.Values "__depParams" ( list ) }}
|
|
{{- if .Values.conf.rgw_ks.enabled -}}
|
|
{{- $__updateDepParams := append $envAll.Values.__depParams "keystone" -}}
|
|
{{- $_ := set $envAll.Values "__depParams" $__updateDepParams -}}
|
|
{{- end -}}
|
|
{{- if .Values.conf.rgw_s3.enabled -}}
|
|
{{- $__updateDepParams := append $envAll.Values.__depParams "s3" -}}
|
|
{{- $_ := set $envAll.Values "__depParams" $__updateDepParams -}}
|
|
{{- end -}}
|
|
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.__depParams "dependencyKey" "rgw" -}}
|
|
{{- $_ := include "helm-toolkit.utils.dependency_resolver" $dependencyOpts | toString | fromYaml }}
|
|
{{ tuple $envAll "pod_dependency" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
|
---
|
|
kind: Deployment
|
|
apiVersion: apps/v1
|
|
metadata:
|
|
name: ceph-rgw
|
|
annotations:
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
|
|
labels:
|
|
{{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
|
spec:
|
|
replicas: {{ .Values.pod.replicas.rgw }}
|
|
selector:
|
|
matchLabels:
|
|
{{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
annotations:
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-client-hash: {{ tuple "configmap-etc-client.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
|
|
spec:
|
|
serviceAccountName: {{ $serviceAccountName }}
|
|
affinity:
|
|
{{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
|
nodeSelector:
|
|
{{ .Values.labels.rgw.node_selector_key }}: {{ .Values.labels.rgw.node_selector_value }}
|
|
initContainers:
|
|
{{ tuple $envAll "pod_dependency" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
- name: ceph-init-dirs
|
|
{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
command:
|
|
- /tmp/init-dirs.sh
|
|
env:
|
|
- name: CLUSTER
|
|
value: "ceph"
|
|
volumeMounts:
|
|
- name: ceph-rgw-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-run
|
|
mountPath: /run
|
|
readOnly: false
|
|
- name: ceph-rgw-init
|
|
{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
env:
|
|
- name: CLUSTER
|
|
value: "ceph"
|
|
- name: POD_NAME
|
|
valueFrom:
|
|
fieldRef:
|
|
apiVersion: v1
|
|
fieldPath: metadata.name
|
|
{{ if .Values.conf.rgw_ks.enabled }}
|
|
{{- with $env := dict "ksUserSecret" .Values.secrets.identity.user_rgw }}
|
|
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
|
|
{{- end }}
|
|
- name: KEYSTONE_URL
|
|
value: {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | trimSuffix .Values.endpoints.identity.path.default | quote }}
|
|
{{ end }}
|
|
- name: RGW_FRONTEND_PORT
|
|
value: "{{ tuple "object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
|
|
command:
|
|
- /tmp/rgw-init.sh
|
|
volumeMounts:
|
|
- name: pod-etc-ceph
|
|
mountPath: /etc/ceph
|
|
- name: ceph-rgw-bin
|
|
mountPath: /tmp/rgw-init.sh
|
|
subPath: rgw-init.sh
|
|
readOnly: true
|
|
- name: ceph-rgw-etc
|
|
mountPath: /etc/ceph/ceph.conf.template
|
|
subPath: ceph.conf
|
|
readOnly: true
|
|
containers:
|
|
- name: ceph-rgw
|
|
{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
env:
|
|
- name: CLUSTER
|
|
value: "ceph"
|
|
- name: RGW_FRONTEND_PORT
|
|
value: "{{ tuple "object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
|
|
command:
|
|
- /tmp/rgw-start.sh
|
|
ports:
|
|
- containerPort: {{ tuple "object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
livenessProbe:
|
|
httpGet:
|
|
path: /
|
|
port: {{ tuple "object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
initialDelaySeconds: 120
|
|
timeoutSeconds: 5
|
|
readinessProbe:
|
|
httpGet:
|
|
path: /
|
|
port: {{ tuple "object_store" "internal" "api" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
timeoutSeconds: 5
|
|
volumeMounts:
|
|
- name: ceph-rgw-bin
|
|
mountPath: /tmp/rgw-start.sh
|
|
subPath: rgw-start.sh
|
|
readOnly: true
|
|
- name: pod-etc-ceph
|
|
mountPath: /etc/ceph
|
|
- name: ceph-rgw-etc
|
|
mountPath: /etc/ceph/ceph.conf.template
|
|
subPath: ceph.conf
|
|
readOnly: true
|
|
- name: ceph-bootstrap-rgw-keyring
|
|
mountPath: /var/lib/ceph/bootstrap-rgw/ceph.keyring
|
|
subPath: ceph.keyring
|
|
readOnly: false
|
|
- name: pod-var-lib-ceph
|
|
mountPath: /var/lib/ceph
|
|
readOnly: false
|
|
- name: pod-run
|
|
mountPath: /run
|
|
readOnly: false
|
|
volumes:
|
|
- name: pod-etc-ceph
|
|
emptyDir: {}
|
|
- name: ceph-rgw-bin
|
|
configMap:
|
|
name: ceph-rgw-bin
|
|
defaultMode: 0555
|
|
- name: ceph-rgw-etc
|
|
configMap:
|
|
name: ceph-rgw-etc
|
|
defaultMode: 0444
|
|
- name: pod-var-lib-ceph
|
|
emptyDir: {}
|
|
- name: pod-run
|
|
emptyDir:
|
|
medium: "Memory"
|
|
- name: ceph-bootstrap-rgw-keyring
|
|
secret:
|
|
secretName: {{ .Values.secrets.keyrings.rgw }}
|
|
{{- end }}
|