From 4643ba41edd4af704b344e9e0587f78d28013040 Mon Sep 17 00:00:00 2001 From: Seonghyun Oh Date: Mon, 14 Dec 2020 12:10:01 +0900 Subject: [PATCH 1/4] Update invoker-pod.yaml --- helm/openwhisk/templates/invoker-pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml index 6747ff0b..1d958897 100644 --- a/helm/openwhisk/templates/invoker-pod.yaml +++ b/helm/openwhisk/templates/invoker-pod.yaml @@ -179,7 +179,7 @@ spec: - name: "METRICS_KAMON" value: "true" {{ end }} -{{ if and .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }} +{{ if or .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }} - name: "METRICS_KAMON_TAGS" value: "true" {{ end }} From 837711ff45ea5c53d970a1c2ab95a646116768fd Mon Sep 17 00:00:00 2001 From: Seonghyun Oh Date: Mon, 14 Dec 2020 12:12:01 +0900 Subject: [PATCH 2/4] Update invoker-pod.yaml --- helm/openwhisk/templates/invoker-pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml index 1d958897..f7060a00 100644 --- a/helm/openwhisk/templates/invoker-pod.yaml +++ b/helm/openwhisk/templates/invoker-pod.yaml @@ -179,7 +179,7 @@ spec: - name: "METRICS_KAMON" value: "true" {{ end }} -{{ if or .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }} +{{ if and .Values.metrics.kamonEnabled .Values.metrics.kamonTags }} - name: "METRICS_KAMON_TAGS" value: "true" {{ end }} From 742b63155ff592c3e355e136a8764bb19ddb5edd Mon Sep 17 00:00:00 2001 From: Seonghyun Oh Date: Mon, 14 Dec 2020 12:13:09 +0900 Subject: [PATCH 3/4] Update invoker-pod.yaml --- helm/openwhisk/templates/invoker-pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml index f7060a00..7da14a32 100644 --- a/helm/openwhisk/templates/invoker-pod.yaml +++ b/helm/openwhisk/templates/invoker-pod.yaml @@ -179,7 +179,7 @@ spec: - name: "METRICS_KAMON" value: "true" {{ end }} -{{ if and .Values.metrics.kamonEnabled .Values.metrics.kamonTags }} +{{ if .Values.metrics.kamonTags }} - name: "METRICS_KAMON_TAGS" value: "true" {{ end }} From fb83df89d35aa07f0a1fbc92bca48ff88de16ab5 Mon Sep 17 00:00:00 2001 From: Seonghyun Oh Date: Mon, 14 Dec 2020 12:13:51 +0900 Subject: [PATCH 4/4] Update controller-pod.yaml --- helm/openwhisk/templates/controller-pod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/openwhisk/templates/controller-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml index 211e1ba7..d6840120 100644 --- a/helm/openwhisk/templates/controller-pod.yaml +++ b/helm/openwhisk/templates/controller-pod.yaml @@ -174,7 +174,7 @@ spec: - name: "METRICS_KAMON" value: "true" {{ end }} -{{ if or .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }} +{{ if .Values.metrics.kamonTags }} - name: "METRICS_KAMON_TAGS" value: "true" {{ end }}