summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorJerome Doucerain <jerome.doucerain@bell.ca>2018-03-02 22:14:27 -0500
committerJerome Doucerain <jerome.doucerain@bell.ca>2018-03-02 22:19:25 -0500
commit7bd243e8765d7c5badc72c486c02ff92bc7f73fc (patch)
tree9e0a740cc9a109169b2b95fae57523b5b5cf1b29 /kubernetes
parent420dc067b7b4608fc840b3062d5369adff7deadd (diff)
adding a selector in so/mariadb/pvc
to be sure the pvc will properly be bound to the expected pv a label has been added to the pv and a selector on matchlabels has been added to the pvc Issue-ID: OOM-786 Change-Id: Ic1c89efc2632623f9bf6467ebc1fd24b3cb4fb93 Signed-off-by: Jerome Doucerain <jerome.doucerain@bell.ca>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/so/charts/mariadb/templates/pv.yaml3
-rw-r--r--kubernetes/so/charts/mariadb/templates/pvc.yaml3
2 files changed, 5 insertions, 1 deletions
diff --git a/kubernetes/so/charts/mariadb/templates/pv.yaml b/kubernetes/so/charts/mariadb/templates/pv.yaml
index 27343e3528..31230a9ed7 100644
--- a/kubernetes/so/charts/mariadb/templates/pv.yaml
+++ b/kubernetes/so/charts/mariadb/templates/pv.yaml
@@ -9,6 +9,7 @@ metadata:
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
+ name: {{ include "common.fullname" . }}
spec:
capacity:
storage: {{ .Values.persistence.size}}
@@ -17,4 +18,4 @@ spec:
persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
hostPath:
path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }}
-{{- end -}} \ No newline at end of file
+{{- end -}}
diff --git a/kubernetes/so/charts/mariadb/templates/pvc.yaml b/kubernetes/so/charts/mariadb/templates/pvc.yaml
index faff46ca3e..b0cd3bf238 100644
--- a/kubernetes/so/charts/mariadb/templates/pvc.yaml
+++ b/kubernetes/so/charts/mariadb/templates/pvc.yaml
@@ -14,6 +14,9 @@ metadata:
{{ toYaml .Values.persistence.annotations | indent 4 }}
{{- end }}
spec:
+ selector:
+ matchLabels:
+ name: {{ include "common.fullname" . }}
accessModes:
- {{ .Values.persistence.accessMode }}
resources: