From 59f9cbfcbb87f9126d5685a2520ea462e14b71fe Mon Sep 17 00:00:00 2001 From: Isa Aguilar Date: Mon, 8 Oct 2018 12:23:15 -0700 Subject: [PATCH] [stable/kiam] Dont add prometheus env vars if scrape is false (#8271) * [stable/kiam] Dont add prometheus env vars if scrape is false Signed-off-by: Isa Aguilar * [stable/kiam] bump 1.2.2 Signed-off-by: Isa Aguilar --- stable/kiam/Chart.yaml | 2 +- stable/kiam/templates/agent-daemonset.yaml | 2 ++ stable/kiam/templates/server-daemonset.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stable/kiam/Chart.yaml b/stable/kiam/Chart.yaml index e99580fca0..4767bb1660 100644 --- a/stable/kiam/Chart.yaml +++ b/stable/kiam/Chart.yaml @@ -1,5 +1,5 @@ name: kiam -version: 1.2.1 +version: 1.2.2 appVersion: 2.8 description: Integrate AWS IAM with Kubernetes keywords: diff --git a/stable/kiam/templates/agent-daemonset.yaml b/stable/kiam/templates/agent-daemonset.yaml index 194d295f7b..f15fa6e5d2 100644 --- a/stable/kiam/templates/agent-daemonset.yaml +++ b/stable/kiam/templates/agent-daemonset.yaml @@ -77,8 +77,10 @@ spec: - --key=/etc/kiam/tls/key - --ca=/etc/kiam/tls/ca - --server-address={{ template "kiam.fullname" . }}-server:{{ .Values.server.service.port }} + {{- if .Values.agent.prometheus.scrape }} - --prometheus-listen-addr=0.0.0.0:{{ .Values.agent.prometheus.port }} - --prometheus-sync-interval={{ .Values.agent.prometheus.syncInterval }} + {{- end }} - --gateway-timeout-creation={{ .Values.agent.gatewayTimeoutCreation }} {{- range $key, $value := .Values.agent.extraArgs }} {{- if $value }} diff --git a/stable/kiam/templates/server-daemonset.yaml b/stable/kiam/templates/server-daemonset.yaml index 2e6c8096d0..27a0456f42 100644 --- a/stable/kiam/templates/server-daemonset.yaml +++ b/stable/kiam/templates/server-daemonset.yaml @@ -71,8 +71,10 @@ spec: {{- end }} - --session-duration={{ .Values.server.sessionDuration }} - --sync={{ .Values.server.cache.syncInterval }} + {{- if .Values.server.prometheus.scrape }} - --prometheus-listen-addr=0.0.0.0:{{ .Values.server.prometheus.port }} - --prometheus-sync-interval={{ .Values.server.prometheus.syncInterval }} + {{- end }} {{- range $key, $value := .Values.server.extraArgs }} {{- if $value }} - --{{ $key }}={{ $value }}