From 5e3f36a4b1710c9c1accc41d2530795d5fb66496 Mon Sep 17 00:00:00 2001 From: Mandeep Khinda Date: Mon, 24 Sep 2018 15:25:42 +0000 Subject: Updating charts to use common resource template Issue-ID: OOM-1145 Change-Id: I1510339a820802554b6e8b9a201619ef66be17a0 Signed-off-by: Mandeep Khinda --- kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml | 2 +- kubernetes/policy/charts/drools/templates/statefulset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kubernetes/policy/charts/drools') diff --git a/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml b/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml index d04f8f8e51..140e7f37df 100644 --- a/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml +++ b/kubernetes/policy/charts/drools/charts/nexus/templates/deployment.yaml @@ -65,7 +65,7 @@ spec: - mountPath: /sonatype-work name: nexus-data resources: -{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} +{{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/policy/charts/drools/templates/statefulset.yaml b/kubernetes/policy/charts/drools/templates/statefulset.yaml index 417ab7e0b1..6564e798ef 100644 --- a/kubernetes/policy/charts/drools/templates/statefulset.yaml +++ b/kubernetes/policy/charts/drools/templates/statefulset.yaml @@ -116,7 +116,7 @@ spec: exec: command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/opt/app/policy/config/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"] resources: -{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} +{{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} - image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.loggingImage }}" imagePullPolicy: {{ .Values.pullPolicy }} -- cgit 1.2.3-korg