From 5e3f36a4b1710c9c1accc41d2530795d5fb66496 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
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 <mandeep.khinda@amdocs.com>
---
 kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml | 2 +-
 kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml   | 2 +-
 .../multicloud/charts/multicloud-windriver/templates/deployment.yaml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kubernetes/multicloud/charts')

diff --git a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
index 1c91e8af3f..c2d966a599 100644
--- a/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-ocata/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
          name: ocata-logconfig
          subPath: log.yml
        resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
index b555d463c3..1a737d67f6 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
          name: vio-logconfig
          subPath: log.yml
        resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index 3dfe72c607..99b1ea9557 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
          name: windriver-logconfig
          subPath: log.yml
        resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
        image: "{{ include "common.repository" . }}/{{ .Values.image }}"
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
-- 
cgit 1.2.3-korg