[openwhisk-deploy-kube] branch master updated: Fix invalid kamonTags setting (#658)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new f6df5a6  Fix invalid kamonTags setting (#658)
f6df5a6 is described below

commit f6df5a616c621797fca9d1bb33741ba064488097
Author: Seonghyun Oh <se...@gmail.com>
AuthorDate: Sat Jan 9 11:49:29 2021 +0900

    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 | 2 +-
 helm/openwhisk/templates/invoker-pod.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 @@ 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 }}
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 @@ spec:
           - 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 }}