Skip to content

Commit

Permalink
disable agent by default and add version check (#183)
Browse files Browse the repository at this point in the history
* disable agent by default

* also add version compare

* edit changelog

* add changelog

* edgectl agent default
  • Loading branch information
acookin authored Mar 12, 2021
1 parent bfa875f commit e34f77a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion templates/aes-agent.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 }}
3 changes: 2 additions & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -504,3 +504,4 @@ agent:
# Leave blank to use image.repository and image.tag
tag:
repository:
deploymentTool: ""

0 comments on commit e34f77a

Please sign in to comment.