Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Increment release version for osdf & has" into frankfurt
[oom.git]
/
kubernetes
/
dmaap
/
components
/
dmaap-dr-prov
/
templates
/
pv.yaml
diff --git
a/kubernetes/dmaap/components/dmaap-dr-prov/templates/pv.yaml
b/kubernetes/dmaap/components/dmaap-dr-prov/templates/pv.yaml
index
b82e676
..
1a09a81
100644
(file)
--- a/
kubernetes/dmaap/components/dmaap-dr-prov/templates/pv.yaml
+++ b/
kubernetes/dmaap/components/dmaap-dr-prov/templates/pv.yaml
@@
-18,6
+18,8
@@
# ============LICENSE_END=========================================================
*/}}
{{- if .Values.global.aafEnabled }}
# ============LICENSE_END=========================================================
*/}}
{{- if .Values.global.aafEnabled }}
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
+{{- if eq "True" (include "common.needPV" .) -}}
kind: PersistentVolume
apiVersion: v1
metadata:
kind: PersistentVolume
apiVersion: v1
metadata:
@@
-26,7
+28,7
@@
metadata:
labels:
app: {{ include "common.name" . }}-aaf-props
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
labels:
app: {{ include "common.name" . }}-aaf-props
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
- release: "{{
.Release.Name
}}"
+ release: "{{
include "common.release" .
}}"
heritage: "{{ .Release.Service }}"
name: {{ include "common.fullname" . }}-aaf-props
spec:
heritage: "{{ .Release.Service }}"
name: {{ include "common.fullname" . }}-aaf-props
spec:
@@
-34,8
+36,10
@@
spec:
storage: {{ .Values.persistence.aafCredsSize}}
accessModes:
- {{ .Values.persistence.accessMode }}
storage: {{ .Values.persistence.aafCredsSize}}
accessModes:
- {{ .Values.persistence.accessMode }}
- storageClassName: "{{ include "common.fullname" . }}-
aaf-props-stcl
"
+ storageClassName: "{{ include "common.fullname" . }}-
data
"
persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
hostPath:
persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
hostPath:
- path: {{ .Values.persistence.mountPath }}/{{
.Release.Name
}}/{{ .Values.persistence.aafCredsMountSubPath }}
+ path: {{ .Values.persistence.mountPath }}/{{
include "common.release" .
}}/{{ .Values.persistence.aafCredsMountSubPath }}
{{ end -}}
{{ end -}}
+{{- end -}}
+{{- end -}}