[ceph-osd] resolve name conflicts by appending release name
This is to resolve name conflicts of reources in case of multiple releases required for single deployment of ceph cluster Change-Id: Ibee5550db788ea57879837b010e22a24240237bf
This commit is contained in:
parent
2eb745d53a
commit
47d429059c
@ -20,7 +20,7 @@ limitations under the License.
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: ceph-osd-bin
|
name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
|
||||||
data:
|
data:
|
||||||
{{- if .Values.images.local_registry.active }}
|
{{- if .Values.images.local_registry.active }}
|
||||||
image-repo-sync.sh: |
|
image-repo-sync.sh: |
|
||||||
|
@ -53,5 +53,5 @@ data:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.manifests.configmap_etc }}
|
{{- if .Values.manifests.configmap_etc }}
|
||||||
{{- list "ceph-osd-etc" . | include "ceph.osd.configmap.etc" }}
|
{{- list (printf "%s-%s" .Release.Name "etc") . | include "ceph.osd.configmap.etc" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -96,10 +96,10 @@ spec:
|
|||||||
volumes:
|
volumes:
|
||||||
- name: ceph-osd-bin
|
- name: ceph-osd-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-bin
|
name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
- name: ceph-osd-etc
|
- name: ceph-osd-etc
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-etc
|
name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
|
||||||
defaultMode: 0444
|
defaultMode: 0444
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -330,7 +330,7 @@ spec:
|
|||||||
medium: "Memory"
|
medium: "Memory"
|
||||||
- name: ceph-osd-bin
|
- name: ceph-osd-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-bin
|
name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
- name: ceph-osd-etc
|
- name: ceph-osd-etc
|
||||||
configMap:
|
configMap:
|
||||||
@ -352,9 +352,9 @@ spec:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
{{- if .Values.manifests.daemonset_osd }}
|
{{- if .Values.manifests.daemonset_osd }}
|
||||||
{{- $daemonset := "osd" }}
|
{{- $daemonset := (printf "%s" .Release.Name) }}
|
||||||
{{- $configMapName := "ceph-osd-etc" }}
|
{{- $configMapName := (printf "%s-%s" .Release.Name "etc") }}
|
||||||
{{- $serviceAccountName := "ceph-osd" }}
|
{{- $serviceAccountName := (printf "%s" .Release.Name) }}
|
||||||
{{ tuple . "osd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple . "osd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "ceph.osd.daemonset" | toString | fromYaml }}
|
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "ceph.osd.daemonset" | toString | fromYaml }}
|
||||||
{{- $configmap_yaml := "ceph.osd.configmap.etc" }}
|
{{- $configmap_yaml := "ceph.osd.configmap.etc" }}
|
||||||
|
@ -60,11 +60,11 @@ spec:
|
|||||||
volumes:
|
volumes:
|
||||||
- name: ceph-osd-bin
|
- name: ceph-osd-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-bin
|
name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
- name: ceph-osd-etc
|
- name: ceph-osd-etc
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-etc
|
name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
|
||||||
defaultMode: 0444
|
defaultMode: 0444
|
||||||
- name: ceph-osd-admin-keyring
|
- name: ceph-osd-admin-keyring
|
||||||
secret:
|
secret:
|
||||||
|
@ -58,13 +58,13 @@ spec:
|
|||||||
volumes:
|
volumes:
|
||||||
- name: ceph-osd-bin
|
- name: ceph-osd-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-bin
|
name: {{ printf "%s-%s" $envAll.Release.Name "bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
- name: ceph-client-admin-keyring
|
- name: ceph-client-admin-keyring
|
||||||
secret:
|
secret:
|
||||||
secretName: {{ .Values.secrets.keyrings.admin }}
|
secretName: {{ .Values.secrets.keyrings.admin }}
|
||||||
- name: ceph-osd-etc
|
- name: ceph-osd-etc
|
||||||
configMap:
|
configMap:
|
||||||
name: ceph-osd-etc
|
name: {{ printf "%s-%s" $envAll.Release.Name "etc" | quote }}
|
||||||
defaultMode: 0444
|
defaultMode: 0444
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user