From 75dca0fa46d7cee65a09fc5bcc94cb7b138b9a5d Mon Sep 17 00:00:00 2001
From: Kiran Meduri <meduri@amazon.com>
Date: Thu, 6 Feb 2020 09:53:26 -0800
Subject: [PATCH 1/2] Allow users to set log verbosity (level) for
 appmesh-controller

---
 stable/appmesh-controller/templates/deployment.yaml | 3 +++
 stable/appmesh-controller/values.yaml               | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/stable/appmesh-controller/templates/deployment.yaml b/stable/appmesh-controller/templates/deployment.yaml
index 7ee83d7ee..71ab14e76 100644
--- a/stable/appmesh-controller/templates/deployment.yaml
+++ b/stable/appmesh-controller/templates/deployment.yaml
@@ -32,6 +32,9 @@ spec:
             {{- if .Values.region }}
             - --aws-region={{ .Values.region }}
             {{- end }}
+            {{- if .Values.logging.verbosity }}
+            - --v={{ .Values.logging.verbosity  }}
+            {{- end }}
           livenessProbe:
             exec:
               command:
diff --git a/stable/appmesh-controller/values.yaml b/stable/appmesh-controller/values.yaml
index 2f6988222..0532d4c49 100644
--- a/stable/appmesh-controller/values.yaml
+++ b/stable/appmesh-controller/values.yaml
@@ -40,3 +40,7 @@ rbac:
   create: true
   # rbac.pspEnabled: `true` if PodSecurityPolicy resources should be created
   pspEnabled: false
+
+logging:
+  #logging.verbosity: <=3 (INFO), >=4 (DEBUG)
+  verbosity: 0

From 1a329c7ca501f0e49320265160ea7d5a546e0397 Mon Sep 17 00:00:00 2001
From: Kiran Meduri <meduri@amazon.com>
Date: Tue, 18 Feb 2020 08:30:06 -0800
Subject: [PATCH 2/2] Change log-level to string-style instead of v-style

---
 stable/appmesh-controller/README.md                 | 1 +
 stable/appmesh-controller/templates/deployment.yaml | 6 ++++--
 stable/appmesh-controller/values.yaml               | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/stable/appmesh-controller/README.md b/stable/appmesh-controller/README.md
index c031802b5..8a6205003 100644
--- a/stable/appmesh-controller/README.md
+++ b/stable/appmesh-controller/README.md
@@ -74,6 +74,7 @@ Parameter | Description | Default
 `image.repository` | image repository | ` 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon/app-mesh-controller`
 `image.tag` | image tag | `<VERSION>`
 `image.pullPolicy` | image pull policy | `IfNotPresent`
+`log.level` | controller log level, possible values are `info` and `debug`  | `info`
 `resources.requests/cpu` | pod CPU request | `100m`
 `resources.requests/memory` | pod memory request | `64Mi`
 `resources.limits/cpu` | pod CPU limit | `2000m`
diff --git a/stable/appmesh-controller/templates/deployment.yaml b/stable/appmesh-controller/templates/deployment.yaml
index 71ab14e76..7cece5dbf 100644
--- a/stable/appmesh-controller/templates/deployment.yaml
+++ b/stable/appmesh-controller/templates/deployment.yaml
@@ -32,8 +32,10 @@ spec:
             {{- if .Values.region }}
             - --aws-region={{ .Values.region }}
             {{- end }}
-            {{- if .Values.logging.verbosity }}
-            - --v={{ .Values.logging.verbosity  }}
+            {{- if eq .Values.log.level "debug" }}
+            - --v=4
+            {{- else if eq .Values.log.level "info" }}
+            - --v=0
             {{- end }}
           livenessProbe:
             exec:
diff --git a/stable/appmesh-controller/values.yaml b/stable/appmesh-controller/values.yaml
index 0532d4c49..3112cdcef 100644
--- a/stable/appmesh-controller/values.yaml
+++ b/stable/appmesh-controller/values.yaml
@@ -41,6 +41,6 @@ rbac:
   # rbac.pspEnabled: `true` if PodSecurityPolicy resources should be created
   pspEnabled: false
 
-logging:
-  #logging.verbosity: <=3 (INFO), >=4 (DEBUG)
-  verbosity: 0
+log:
+  #log.level: info (default), debug
+  level: "info"