From 9f7e6eda90752232239f70061784a4ab2e643236 Mon Sep 17 00:00:00 2001
From: Jawon Choo <jawon.choo@sk.com>
Date: Mon, 21 Aug 2017 11:41:31 +0900
Subject: [PATCH] pod resources mismatched in ingress chart

in ingress chart,
ingress/error resource configuration is mismatched.

Change-Id: Idd9ea2692981b2ba971a259844f703ec9e7307b1
Closes-Bug: #1711980
---
 ingress/templates/deployment-error.yaml   | 2 +-
 ingress/templates/deployment-ingress.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml
index 2d61fd0e50..2ea5cd30c6 100644
--- a/ingress/templates/deployment-error.yaml
+++ b/ingress/templates/deployment-error.yaml
@@ -37,7 +37,7 @@ spec:
         - name: ingress-error-pages
           image: {{ .Values.images.error_pages }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           livenessProbe:
             httpGet:
               path: /healthz
diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml
index b365335730..5e22f61713 100644
--- a/ingress/templates/deployment-ingress.yaml
+++ b/ingress/templates/deployment-ingress.yaml
@@ -53,7 +53,7 @@ spec:
         - name: ingress-api
           image: {{ .Values.images.ingress }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           readinessProbe:
             httpGet:
               path: /healthz