commit f6df5a616c621797fca9d1bb33741ba064488097
author Seonghyun Oh <seonghyunoh@gmail.com> Sat Jan 09 11:49:29 2021 +0900
committer GitHub <noreply@github.com> Sat Jan 09 11:49:29 2021 +0900
tree c6378ff0fe7f89b5e9786816724909f4873b7275
parent 6a860c8e0133047e0948539f656f08dc2a08e9dd

Fix invalid kamonTags setting (#658)

* Update invoker-pod.yaml

* Update invoker-pod.yaml

* Update invoker-pod.yaml

* Update controller-pod.yaml

helm/openwhisk/templates/controller-pod.yaml

diff --git a/helm/openwhisk/templates/controller-pod.yaml b/helm/openwhisk/templates/controller-pod.yaml
index f40180d..28a9756 100644
--- a/helm/openwhisk/templates/controller-pod.yaml
+++ b/helm/openwhisk/templates/controller-pod.yaml
@@ -178,7 +178,7 @@
         - 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 }}

helm/openwhisk/templates/invoker-pod.yaml

diff --git a/helm/openwhisk/templates/invoker-pod.yaml b/helm/openwhisk/templates/invoker-pod.yaml
index 04180fd..dbb8028 100644
--- a/helm/openwhisk/templates/invoker-pod.yaml
+++ b/helm/openwhisk/templates/invoker-pod.yaml
@@ -181,7 +181,7 @@
           - name: "METRICS_KAMON"
             value: "true"
 {{ end }}
-{{ if and .Values.metrics.kamonTags .Values.metrics.prometheusEnabled }}
+{{ if .Values.metrics.kamonTags }}
           - name: "METRICS_KAMON_TAGS"
             value: "true"
 {{ end }}