Merge "Add missing prometheus and alertmanager resources"

This commit is contained in:
Zuul 2017-12-14 00:20:52 +00:00 committed by Gerrit Code Review
commit 093e64631d
3 changed files with 36 additions and 11 deletions

View File

@ -65,6 +65,14 @@ pod:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
jobs:
image_repo_sync:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "1024Mi"
cpu: "2000m"
endpoints: endpoints:
cluster_domain_suffix: cluster.local cluster_domain_suffix: cluster.local

View File

@ -28,6 +28,7 @@ spec:
containers: containers:
- name: {{.Release.Name}}-helm-tests - name: {{.Release.Name}}-helm-tests
{{ tuple $envAll "helm_tests" | include "helm-toolkit.snippets.image" | indent 6 }} {{ 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: command:
- /tmp/helm-tests.sh - /tmp/helm-tests.sh
env: env:
@ -39,6 +40,7 @@ spec:
subPath: helm-tests.sh subPath: helm-tests.sh
readOnly: true readOnly: true
volumes: volumes:
{{ tuple . | include "helm-toolkit.snippets.kubernetes_entrypoint_secret_mount" | indent 4 }}
- name: prometheus-bin - name: prometheus-bin
configMap: configMap:
name: prometheus-bin name: prometheus-bin

View File

@ -66,6 +66,21 @@ pod:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" 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: endpoints:
cluster_domain_suffix: cluster.local cluster_domain_suffix: cluster.local