From 5fb15f8670715860332be8ff3ac95545bf335570 Mon Sep 17 00:00:00 2001
From: Scott Hussey <sh8121@att.com>
Date: Mon, 2 Apr 2018 14:33:32 -0500
Subject: [PATCH] Add controller manager resource limits

- Add missing resource limits for static pod for
  Kubernetes controller manager

Change-Id: Ie4586217c9f6ec12f65c0b522a3c1e4c65e30ef0
---
 charts/controller_manager/templates/daemonset.yaml        | 2 +-
 .../templates/etc/_kubernetes-controller-manager.yaml.tpl | 1 +
 charts/controller_manager/values.yaml                     | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/charts/controller_manager/templates/daemonset.yaml b/charts/controller_manager/templates/daemonset.yaml
index 59c484de..e350ada7 100644
--- a/charts/controller_manager/templates/daemonset.yaml
+++ b/charts/controller_manager/templates/daemonset.yaml
@@ -53,7 +53,7 @@ spec:
             value: /host{{ .Values.anchor.kubelet.manifest_path }}/kubernetes-controller-manager.yaml
           - name: ETC_PATH
             value: /host{{ .Values.controller_manager.host_etc_path }}
-{{ tuple $envAll $envAll.Values.pod.resources.controller_manager | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.anchor_pod | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/bin/anchor
           lifecycle:
diff --git a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl
index 3bb14436..4f6c3027 100644
--- a/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl
+++ b/charts/controller_manager/templates/etc/_kubernetes-controller-manager.yaml.tpl
@@ -27,6 +27,7 @@ spec:
   containers:
     - name: controller-manager
       image: {{ .Values.images.tags.controller_manager }}
+{{ tuple $envAll $envAll.Values.pod.resources.controller_manager | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
         - name: POD_IP
           valueFrom:
diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml
index c0650902..fcd84afc 100644
--- a/charts/controller_manager/values.yaml
+++ b/charts/controller_manager/values.yaml
@@ -100,7 +100,13 @@ pod:
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-
+    anchor_pod:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
 manifests:
   configmap_bin: true
   configmap_etc: true