From e34f77a3410c5ae33c50bea2400bbd41e82c7c4a Mon Sep 17 00:00:00 2001
From: Alix Cook <alixcook@datawire.io>
Date: Fri, 12 Mar 2021 10:59:24 -0500
Subject: [PATCH] disable agent by default and add version check (#183)

* disable agent by default

* also add version compare

* edit changelog

* add changelog

* edgectl agent default
---
 CHANGELOG.md             | 4 ++++
 Chart.yaml               | 2 +-
 templates/aes-agent.yaml | 4 +++-
 values.yaml              | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a03577f1..986345299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
+## v6.5.22
+
+- Bugfix: Disable the cloud agent by default. The agent will be enabled in 6.6.0.
+- Bugfix: Adds a check to prevent the cloud agent from being installed if AES version is less than 1.12.0
 
 ## v6.5.21
 
diff --git a/Chart.yaml b/Chart.yaml
index 973c8f646..5241dc622 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.12.0
 ossVersion: 1.12.0
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 6.5.21
+version: 6.5.22
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
 sources:
diff --git a/templates/aes-agent.yaml b/templates/aes-agent.yaml
index c69c6566d..95f3bf972 100644
--- a/templates/aes-agent.yaml
+++ b/templates/aes-agent.yaml
@@ -1,4 +1,5 @@
-{{- if and .Values.agent.enabled .Values.enableAES }}
+{{- if and (or .Values.agent.enabled (eq "edgectl" .Values.deploymentTool)) .Values.enableAES  }}
+{{- if ne (semver "1.12.0" | (semver .Values.image.tag).Compare) -1 }}
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -184,3 +185,4 @@ spec:
         - name: AES_SNAPSHOT_URL
           value: "http://{{ include "ambassador.fullname" . }}-admin.{{ include "ambassador.namespace" . }}:{{ .Values.adminService.snapshotPort }}/snapshot-external"
 {{- end }}
+{{- end }}
diff --git a/values.yaml b/values.yaml
index b3e3818fb..c03f3d896 100644
--- a/values.yaml
+++ b/values.yaml
@@ -495,7 +495,7 @@ servicePreview:
 
 # Configure the ambassador agent
 agent:
-  enabled: true
+  enabled: false
   # this will be empty when it first gets applied, then the user will edit the agent to
   # make it start reporting
   cloudConnectToken: ""
@@ -504,3 +504,4 @@ agent:
     # Leave blank to use image.repository and image.tag
     tag:
     repository:
+deploymentTool: ""