Merge pull request #185 from datawire/rel/v1.12.1

Update Ambassador to version 1.12.1
datawire · Mar 12, 2021 · c540b0d · c540b0d
2 parents e34f77a + 0227a50
commit c540b0d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
+
+## v6.6.0
+
+- Update Ambassador to version 1.12.1: [CHANGELOG](https://github.com/datawire/ambassador/blob/master/CHANGELOG.md)
+- Feature: Apply Ambassador Agent deployment by default to enable Service Catalog reporting (https://app.getambassador.io)
+
 ## v6.5.22
 
 - Bugfix: Disable the cloud agent by default. The agent will be enabled in 6.6.0.

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 1.12.0
-ossVersion: 1.12.0
+appVersion: 1.12.1
+ossVersion: 1.12.1
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 6.5.22
+version: 6.6.0
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
 sources:

diff --git a/README.md b/README.md
@@ -100,7 +100,7 @@ The following tables lists the configurable parameters of the Ambassador chart a
 | `envRaw`                                           | Additional environment variables in raw YAML format                                                                                                                      | `{}`                                                                                                |
 | `image.pullPolicy`                                 | Ambassador image pull policy                                                                                                                                             | `IfNotPresent`                                                                                      |
 | `image.repository`                                 | Ambassador image                                                                                                                                                         | `docker.io/datawire/aes`                                                                            |
-| `image.tag`                                        | Ambassador image tag                                                                                                                                                     | `1.12.0`                                                                                             |
+| `image.tag`                                        | Ambassador image tag                                                                                                                                                     | `1.12.1`                                                                                             |
 | `imagePullSecrets`                                 | Image pull secrets                                                                                                                                                       | `[]`                                                                                                |
 | `namespace.name`                                   | Set the `AMBASSADOR_NAMESPACE` environment variable                                                                                                                      | `metadata.namespace`                                                                                |
 | `scope.singleNamespace`                            | Set the `AMBASSADOR_SINGLE_NAMESPACE` environment variable and create namespaced RBAC if `rbac.enabled: true`                                                            | `false`                                                                                             |

diff --git a/templates/aes-agent.yaml b/templates/aes-agent.yaml
@@ -1,4 +1,4 @@
-{{- if and (or .Values.agent.enabled (eq "edgectl" .Values.deploymentTool)) .Values.enableAES  }}
+{{- if and .Values.agent.enabled .Values.enableAES  }}
 {{- if ne (semver "1.12.0" | (semver .Values.image.tag).Compare) -1 }}
 ---
 apiVersion: v1

diff --git a/values.yaml b/values.yaml
@@ -119,7 +119,7 @@ security:
 
 image:
   repository: docker.io/datawire/aes
-  tag: 1.12.0
+  tag: 1.12.1
   pullPolicy: IfNotPresent
 
 dnsPolicy: "ClusterFirst"
@@ -495,7 +495,7 @@ servicePreview:
 
 # Configure the ambassador agent
 agent:
-  enabled: false
+  enabled: true
   # this will be empty when it first gets applied, then the user will edit the agent to
   # make it start reporting
   cloudConnectToken: ""