Addressing feedback

Signed-off-by: Tenshin Higashi <[email protected]>
emissary-ingress · Oct 31, 2023 · 5380ef5 · 5380ef5
1 parent e89ced0
commit 5380ef5
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 14 deletions.
diff --git a/charts/emissary-ingress/Chart.lock b/charts/emissary-ingress/Chart.lock
@@ -2,5 +2,5 @@ dependencies:
 - name: ambassador-agent
   repository: https://s3.amazonaws.com/datawire-static-files/charts
   version: 1.0.16
-digest: sha256:8dc1df2b1095dba61a39d2c9a1c0f908b396dec7d6e4589164b8ff6336afa65d
-generated: "2023-10-23T14:45:54.877233-04:00"
+digest: sha256:7b123f62267cfea698be6025f4a29518df8396f189701e4b9cc836ca254173ff
+generated: "2023-10-31T15:03:28.875453-04:00"
diff --git a/charts/emissary-ingress/Chart.yaml.in b/charts/emissary-ingress/Chart.yaml.in
@@ -30,5 +30,5 @@ dependencies:
   - name: ambassador-agent
     version: 1.0.16
     repository: https://s3.amazonaws.com/datawire-static-files/charts
-    condition: ambassador-agent.enabled
+    condition: agent.enabled
     alias: agent
diff --git a/charts/emissary-ingress/values.yaml.in b/charts/emissary-ingress/values.yaml.in
@@ -405,14 +405,11 @@ prometheusExporter: # +doc-gen:break
 # securityContext:
 #   runAsUser: 8888
 
-
-ambassador-agent:
-  # If `true`, installs the ambassador-agent Deployment enabling the Ambassador Cloud connectivity.
-  enabled: true
-
 # ambassador-agent Values.
 # all values under agent key are passed to [the ambassador-agent chart](https://github.com/datawire/ambassador-agent/tree/master/helm/ambassador-agent)
-agent: {}
+agent:
+  # If `true`, installs the ambassador-agent Deployment enabling the Ambassador Cloud connectivity.
+  enabled: true
 
 deploymentTool: ''
 

diff --git a/k8s-config/emissary-defaultns/values.yaml b/k8s-config/emissary-defaultns/values.yaml
@@ -33,6 +33,6 @@ waitForApiext:
   enabled: true
   createRoles: true
 
-ambassador-agent:
+agent:
   enabled: true
 
diff --git a/k8s-config/emissary-emissaryns/values.yaml b/k8s-config/emissary-emissaryns/values.yaml
@@ -34,5 +34,5 @@ waitForApiext:
   enabled: true
   createRoles: true
 
-ambassador-agent:
+agent:
   enabled: true
diff --git a/k8s-config/kat-ambassador/values.yaml b/k8s-config/kat-ambassador/values.yaml
@@ -36,7 +36,7 @@ volumeMounts:
 resources: null
 
 module: null
-ambassador-agent:
+agent:
   enabled: false
 
 waitForApiext:

diff --git a/k8s-config/kat-rbac-multinamespace/values.yaml b/k8s-config/kat-rbac-multinamespace/values.yaml
@@ -5,7 +5,7 @@ serviceAccount:
   extra: "«serviceAccountExtra»♯: null"
 
 module: null
-ambassador-agent:
+agent:
   enabled: false
 
 waitForApiext:

diff --git a/k8s-config/kat-rbac-singlenamespace/values.yaml b/k8s-config/kat-rbac-singlenamespace/values.yaml
@@ -7,7 +7,7 @@ scope:
   singleNamespace: true
 
 module: null
-ambassador-agent:
+agent:
   enabled: false
 
 waitForApiext: