Merge pull request #4 from datawire/alicewasko/release-7.1.0-ea

[WIP] Prep edge-stack chart for release

Author: Alice-Lilith

charts/edge-stack/CHANGELOG.md

@@ -7,6 +7,11 @@ numbering uses [semantic versioning](http://semver.org).
 
 (no changes yet)
 
+## v7.1.0-ea
+
+- Feature: New canarying features for Ambassador in the chart that allow creation of a secondary deployment/service to test new versions and environment variables.
+- Feature: Exposed `progressDeadlineSeconds` for the Ambassador and Ambassador Agent Deployments with new values
+
 ## v7.0.0-ea
 
 - Update Edge Stack chart image to version v2.0.0-ea: [CHANGELOG](https://github.com/datawire/edge-stack/blob/master/CHANGELOG.md)

charts/edge-stack/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: emissary-ingress
   repository: https://s3.amazonaws.com/datawire-static-files/charts
-  version: 7.0.0-ea
-digest: sha256:9ad439487ce2ddf2be623d04a58dbd5a1c91067f7f69a23d391df4be97a0b115
-generated: "2021-06-24T16:57:24.2987-06:00"
+  version: 7.1.0-ea
+digest: sha256:a8609203f78091b1ca1d5a2f4b7df0b3f7bc7bcc12a7471f0058050c0861c266
+generated: "2021-07-15T13:33:36.856800266-07:00"

charts/edge-stack/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.0-ea
 description: A Helm chart for Ambassador Edge Stack
 name: edge-stack
-version: 7.0.0-ea
+version: 7.1.0-ea
 # TODO: change these to whatever the appropriate things are
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
@@ -27,5 +27,5 @@ maintainers:
 engine: gotpl
 dependencies:
 - name: emissary-ingress
-  version: 7.0.0-ea
+  version: v7.1.0-ea
   repository: "https://s3.amazonaws.com/datawire-static-files/charts"

charts/edge-stack/charts/emissary-ingress-7.0.0-ea.tgz

@@ -30,6 +30,44 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 {{- end -}}
 
+
+{{/*
+Set the image that should be used for ambassador.
+Use fullImageOverride if present,
+Then if the image repository is explicitly set, use "repository:image"
+*/}}
+{{- define "ambassador.image" -}}
+{{- if .Values.image.fullImageOverride }}
+{{- .Values.image.fullImageOverride }}
+{{- else if hasKey .Values.image "repository"  -}}
+{{- printf "%s:%s" .Values.image.repository .Values.image.tag -}}
+{{- else -}}
+{{- printf "%s:%s" "docker.io/datawire/aes" .Values.image.tag -}}
+{{- end -}}
+{{- end -}}
+
+
+{{/*
+Set the image that should be used for the canary deployment.
+disabled if fullImageOverride is present
+*/}}
+{{- define "ambassador.canaryImage" -}}
+{{- if .Values.image.fullImageOverride }}
+{{- printf "%s" "" -}}
+{{- else if and .Values.canary.image.repository .Values.canary.image.tag -}}
+{{- printf "%s:%s" .Values.canary.image.repository .Values.canary.image.tag -}}
+{{- else if .Values.canary.image.tag -}}
+{{- if hasKey .Values.image "repository" -}}
+{{- printf "%s:%s" .Values.image.repository .Values.canary.image.tag -}}
+{{- else -}}
+{{- printf "%s:%s" "docker.io/datawire/aes" .Values.canary.image.tag -}}
+{{- end -}}
+{{- else -}}
+{{- printf "%s" "" -}}
+{{- end -}}
+{{- end -}}
+
+
 {{/*
 Create chart namespace based on override value.
 */}}