Merge pull request #163 from datawire/rel/v1.11.0

Ambassador 1.11.0
datawire · Jan 27, 2021 · d8959c4 · d8959c4
2 parents 93188cd + 22c453c
commit d8959c4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
+## v6.5.17
+
+- Bugfix: Fix Mapping definition to correctly support labels in use.
+
 ## v6.5.16
 
 - Bugfix: Ambassador CRD cleanup will now execute as expected.

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 1.10.0
-ossVersion: 1.10.0
+appVersion: 1.11.0
+ossVersion: 1.11.0
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 6.5.16
+version: 6.5.17
 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.10.0`                                                                                             |
+| `image.tag`                                        | Ambassador image tag                                                                                                                                                     | `1.11.0`                                                                                             |
 | `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/crds/getambassador.io_mappings.yaml b/crds/getambassador.io_mappings.yaml
@@ -225,11 +225,16 @@ spec:
               type: object
             labels:
               additionalProperties:
+                description: A MappingLabelGroupsArray is an array of MappingLabelGroups. I know, complex.
                 items:
-                  additionalProperties: {}
-                  description: 'Python: MappingLabels = Dict[str, Union[str,''MappingLabels'']]'
+                  additionalProperties:
+                    description: 'A MappingLabelsArray is the value in the MappingLabelGroup: an array of label specifiers.'
+                    items: {}
+                    type: array
+                  description: 'A MappingLabelGroup is a single element of a MappingLabelGroupsArray: a second map, where the key is a human-readable name that identifies the group.'
                   type: object
                 type: array
+              description: A DomainMap is the overall Mapping.spec.Labels type. It maps domains (kind of like namespaces for Mapping labels) to arrays of label groups.
               type: object
             load_balancer:
               properties:

diff --git a/values.yaml b/values.yaml
@@ -119,7 +119,7 @@ security:
 
 image:
   repository: docker.io/datawire/aes
-  tag: 1.10.0
+  tag: 1.11.0
   pullPolicy: IfNotPresent
 
 dnsPolicy: "ClusterFirst"