diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-12-18 11:35:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-12-18 11:35:07 +0000 |
| commit | 45af03afbe57b068ebffb45e91c230cc50d4344c (patch) | |
| tree | ada92f7bae51f27207724a6bd8c6506ba905ebd9 /kubernetes/dmaap/components/dmaap-dr-prov/templates | |
| parent | aab7b218f456882edb50eb4b7f4358eadadb3df2 (diff) | |
| parent | 60141128dc3b8224b9f414c599d3c8826574c45c (diff) | |
Merge "[DMaaP] Use global storage templates for PVC"
Diffstat (limited to 'kubernetes/dmaap/components/dmaap-dr-prov/templates')
3 files changed, 14 insertions, 7 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml index a1d148d88b..52ac9eb6f3 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/deployment.yaml @@ -162,8 +162,12 @@ spec: emptyDir: {} {{- if .Values.global.aafEnabled }} - name: {{ include "common.fullname" . }}-aaf-config-vol + {{- if .Values.persistence.enabled }} persistentVolumeClaim: claimName: {{ include "common.fullname" . }}-aaf-props - {{ end }} + {{- else }} + emptyDir: {} + {{- end }} + {{- end }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/pv.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/pv.yaml index b82e67673a..fba1bf9036 100644 --- 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 }} +{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} +{{- if eq "True" (include "common.needPV" .) -}} kind: PersistentVolume apiVersion: v1 metadata: @@ -34,8 +36,10 @@ spec: 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: path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.aafCredsMountSubPath }} {{ end -}} +{{- end -}} +{{- end -}} diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml index 6ff9e6d615..b75daf5f12 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/templates/pvc.yaml @@ -18,6 +18,7 @@ # ============LICENSE_END========================================================= */}} {{- if .Values.global.aafEnabled }} +{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -33,13 +34,11 @@ metadata: {{ toYaml .Values.persistence.annotations | indent 4 }} {{- end }} spec: - selector: - matchLabels: - name: {{ include "common.fullname" . }}-aaf-props accessModes: - {{ .Values.persistence.accessMode }} - storageClassName: "{{ include "common.fullname" . }}-aaf-props-stcl" + storageClassName: {{ include "common.storageClass" . }} resources: requests: storage: {{ .Values.persistence.aafCredsSize }} -{{ end -}}
\ No newline at end of file +{{ end -}} +{{ end -}} |