From b7f4e8e17aa9cd2adba42756bf7d56f36d90449b Mon Sep 17 00:00:00 2001 From: nbkrause Date: Thu, 21 Mar 2019 11:39:37 -0400 Subject: [PATCH] Nkrause/amb (#12426) * Restore default replicas == 3 Signed-off-by: Flynn * Fix some markdown Signed-off-by: Flynn * Bump chart version, and switch my name to Flynn. :) Signed-off-by: Flynn * Add icon. Signed-off-by: Flynn * Sort OWNERS, and add nbkrause (from Datawire) Signed-off-by: Flynn * Heh. Didn't realize a change to OWNERS required a version bump. Signed-off-by: Flynn * Bump to Ambassador 0.50.2. Signed-off-by: Flynn * Bump Ambassador to version 0.50.3. Signed-off-by: Flynn * Augh. Fix Ambassador versions in values.yaml and README. Signed-off-by: Flynn * Update chart maintainers per PR comments Signed-off-by: Flynn * Support SINGLE_NAMESPACE and do not set ambassador.id by default Signed-off-by: Noah Krause * Bump chart version Signed-off-by: Noah Krause * Remove namespace.single from values file since it is no longer configured that way Signed-off-by: Noah Krause * Move `AMBASSADOR_ID` configuration in environment varible in `env` Signed-off-by: Noah Krause * Add message to env in values Signed-off-by: Noah Krause * Update values.yaml Signed-off-by: Noah Krause * Add section to upgrading to chart v2.0.0 Signed-off-by: Noah Krause --- stable/ambassador/Chart.yaml | 4 ++-- stable/ambassador/README.md | 11 ++++++++++- stable/ambassador/templates/deployment.yaml | 4 +--- stable/ambassador/values.yaml | 10 ++++------ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/stable/ambassador/Chart.yaml b/stable/ambassador/Chart.yaml index c2014e3287..b02cae8c08 100644 --- a/stable/ambassador/Chart.yaml +++ b/stable/ambassador/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 0.50.3 +appVersion: 0.51.2 description: A Helm chart for Datawire Ambassador name: ambassador -version: 1.1.5 +version: 2.0.0 icon: https://www.getambassador.io/images/logo.png home: https://www.getambassador.io/ sources: diff --git a/stable/ambassador/README.md b/stable/ambassador/README.md index 2f60b8f307..02af587909 100755 --- a/stable/ambassador/README.md +++ b/stable/ambassador/README.md @@ -47,7 +47,6 @@ The following tables lists the configurable parameters of the Ambassador chart a | `adminService.create` | If `true`, create a service for Ambassador's admin UI | `true` | | `adminService.nodePort` | If explicit NodePort for admin service is required | `true` | | `adminService.type` | Ambassador's admin service type to be used | `ClusterIP` | -| `ambassador.id` | Set the identifier of the Ambassador instance | `default` | | `ambassadorConfig` | Config thats mounted to `/ambassador/ambassador-config` | `""` | | `daemonSet` | If `true`, Create a daemonSet. By default Deployment controller will be created | `false` | | `env` | Any additional environment variables for ambassador pods | `{}` | @@ -128,6 +127,16 @@ $ helm upgrade --install --wait my-release -f values.yaml stable/ambassador # Upgrading +## To 2.0.0 + +### Ambassador ID + +ambassador.id has been removed in favor of setting it via an environment variable in `env`. `AMBASSADOR_ID` defaults to `default` if not set in the environment. This is mainly used for [running multiple Ambassadors](https://www.getambassador.io/reference/running#ambassador_id) in the same cluster. + +| Parameter | Env variables | +| --------------- | --------------- | +| `ambassador.id` | `AMBASSADOR_ID` | + ## Migrating from `datawire/ambassador` chart (chart version 0.40.0 or 0.50.0) Chart now runs ambassador as non-root by default, so you might need to update your ambassador module config to match this. diff --git a/stable/ambassador/templates/deployment.yaml b/stable/ambassador/templates/deployment.yaml index d2509937c7..28878bc6fe 100644 --- a/stable/ambassador/templates/deployment.yaml +++ b/stable/ambassador/templates/deployment.yaml @@ -95,10 +95,8 @@ spec: - name: STATSD_HOST value: "localhost" {{- end }} - - name: AMBASSADOR_ID - value: {{ .Values.ambassador.id | quote }} - name: AMBASSADOR_NAMESPACE - {{- if .Values.namespace.name }} + {{- if .Values.namespace }} value: {{ .Values.namespace.name | quote }} {{ else }} valueFrom: diff --git a/stable/ambassador/values.yaml b/stable/ambassador/values.yaml index 61437e2ec0..579c347feb 100644 --- a/stable/ambassador/values.yaml +++ b/stable/ambassador/values.yaml @@ -5,11 +5,7 @@ replicaCount: 3 daemonSet: false -ambassador: - id: default - -namespace: - single: false +# namespace: # name: default # Additional container environment variable @@ -24,8 +20,10 @@ env: # AMBASSADOR_DRAIN_TIME: 5 # sets the number of seconds that Ambassador will wait for the old Envoy to clean up and exit on a restart # AMBASSADOR_SHUTDOWN_TIME: 10 - # sets the number of seconds that Ambassador will wait for the old Envoy to clean up and exit on a restart + # tells Ambassador to only use resources in the namespace set by namespace.name # AMBASSADOR_SINGLE_NAMESPACE: true + # labels Ambassador with an ID to allow for configuring multiple Ambassadors in a cluster + # AMBASSADOR_ID: default imagePullSecrets: []