Merge pull request #153 from datawire/rel/v1.10.0

Update for Ambassador 1.10.0
datawire · Jan 4, 2021 · 41f4351 · 41f4351
2 parents 54849e6 + 55bd696
commit 41f4351
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
+## v6.5.14
+
+- Update for Ambassador v1.10.0
+
 ## v6.5.13
 
 - Update for Ambassador v1.9.1

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 1.9.1
-ossVersion: 1.9.1
+appVersion: 1.10.0
+ossVersion: 1.10.0
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 6.5.13
+version: 6.5.14
 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.9.1`                                                                                             |
+| `image.tag`                                        | Ambassador image tag                                                                                                                                                     | `1.10.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_authservices.yaml b/crds/getambassador.io_authservices.yaml
@@ -98,6 +98,8 @@ spec:
               oneOf:
               - type: string
               - type: boolean
+          required:
+          - auth_service
           type: object
       type: object
   version: null

diff --git a/crds/getambassador.io_mappings.yaml b/crds/getambassador.io_mappings.yaml
@@ -179,7 +179,11 @@ spec:
                         type: string
                       text_format_source:
                         description: A format string sourced from a file on the Ambassador container. Useful for larger response bodies that should not be placed inline in configuration.
-                        type: string
+                        properties:
+                          filename:
+                            description: The name of a file on the Ambassador pod that contains a format text string.
+                            type: string
+                        type: object
                     type: object
                   on_status_code:
                     description: The status code to match on
@@ -265,13 +269,17 @@ spec:
             outlier_detection:
               type: string
             path_redirect:
+              description: Path replacement to use when generating an HTTP redirect. Used with `host_redirect`.
               type: string
             precedence:
               type: integer
             prefix:
               type: string
             prefix_exact:
               type: boolean
+            prefix_redirect:
+              description: Prefix rewrite to use when generating an HTTP redirect. Used with `host_redirect`.
+              type: string
             prefix_regex:
               type: boolean
             priority:
@@ -282,6 +290,15 @@ spec:
                 - type: string
                 - type: boolean
               type: object
+            redirect_response_code:
+              description: The response code to use when generating an HTTP redirect. Defaults to 301. Used with `host_redirect`.
+              enum:
+              - 301
+              - 302
+              - 303
+              - 307
+              - 308
+              type: integer
             regex_headers:
               additionalProperties:
                 oneOf:
@@ -294,6 +311,13 @@ spec:
                 - type: string
                 - type: boolean
               type: object
+            regex_redirect:
+              additionalProperties:
+                oneOf:
+                - type: string
+                - type: boolean
+              description: Prefix regex rewrite to use when generating an HTTP redirect. Used with `host_redirect`.
+              type: object
             regex_rewrite:
               additionalProperties:
                 oneOf:
@@ -347,6 +371,9 @@ spec:
               type: boolean
             weight:
               type: integer
+          required:
+          - prefix
+          - service
           type: object
         status:
           description: MappingStatus defines the observed state of Mapping

diff --git a/crds/getambassador.io_ratelimitservices.yaml b/crds/getambassador.io_ratelimitservices.yaml
@@ -57,6 +57,8 @@ spec:
               oneOf:
               - type: string
               - type: boolean
+          required:
+          - service
           type: object
       type: object
   version: null

diff --git a/crds/getambassador.io_tcpmappings.yaml b/crds/getambassador.io_tcpmappings.yaml
@@ -85,6 +85,9 @@ spec:
               - type: boolean
             weight:
               type: integer
+          required:
+          - port
+          - service
           type: object
       type: object
   version: null

diff --git a/crds/getambassador.io_tracingservices.yaml b/crds/getambassador.io_tracingservices.yaml
@@ -86,6 +86,9 @@ spec:
               items:
                 type: string
               type: array
+          required:
+          - driver
+          - service
           type: object
       type: object
   version: null

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