From 5fae0f2880e66227132979f2dacc1fe7bdd468e6 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Fri, 1 Dec 2017 18:30:47 -0600
Subject: [PATCH] Add missing prometheus and alertmanager resources

Alertmanager and prometheus were missing entries for job
resources in values.yaml. Also added resources to the prometheus
helm test template

Change-Id: I11dbad19d1f881c398a4b4dcd0c0eab23fccf278
---
 alertmanager/values.yaml                 |  8 ++++++++
 prometheus/templates/pod-helm-tests.yaml | 24 +++++++++++++-----------
 prometheus/values.yaml                   | 15 +++++++++++++++
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/alertmanager/values.yaml b/alertmanager/values.yaml
index 0b1ffbb248..e7e46ffdf7 100644
--- a/alertmanager/values.yaml
+++ b/alertmanager/values.yaml
@@ -65,6 +65,14 @@ pod:
       requests:
         memory: "128Mi"
         cpu: "500m"
+    jobs:
+      image_repo_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 endpoints:
   cluster_domain_suffix: cluster.local
diff --git a/prometheus/templates/pod-helm-tests.yaml b/prometheus/templates/pod-helm-tests.yaml
index 96a7175191..0fa3fa285c 100644
--- a/prometheus/templates/pod-helm-tests.yaml
+++ b/prometheus/templates/pod-helm-tests.yaml
@@ -28,19 +28,21 @@ spec:
   containers:
     - name: {{.Release.Name}}-helm-tests
 {{ tuple $envAll "helm_tests" | include "helm-toolkit.snippets.image" | indent 6 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
-      - /tmp/helm-tests.sh
+        - /tmp/helm-tests.sh
       env:
-      - name: PROMETHEUS_ENDPOINT
-        value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
+        - name: PROMETHEUS_ENDPOINT
+          value: {{ tuple "monitoring" "internal" "api" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}
       volumeMounts:
-      - name: prometheus-bin
-        mountPath: /tmp/helm-tests.sh
-        subPath: helm-tests.sh
-        readOnly: true
+        - name: prometheus-bin
+          mountPath: /tmp/helm-tests.sh
+          subPath: helm-tests.sh
+          readOnly: true
   volumes:
-  - name: prometheus-bin
-    configMap:
-      name: prometheus-bin
-      defaultMode: 0555
+{{ tuple . | include "helm-toolkit.snippets.kubernetes_entrypoint_secret_mount" | indent 4 }}
+    - name: prometheus-bin
+      configMap:
+        name: prometheus-bin
+        defaultMode: 0555
 {{- end }}
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index d6eec3c526..debda33060 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -66,6 +66,21 @@ pod:
       requests:
         memory: "128Mi"
         cpu: "500m"
+    jobs:
+      image_repo_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 endpoints:
   cluster_domain_suffix: cluster.local