Merge pull request #141 from datawire/rel/v1.9.0

Update for Ambassador v1.9.0
datawire · Nov 12, 2020 · eceb3e6 · eceb3e6
2 parents f90711b + 6e0d865
commit eceb3e6
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
+## v6.5.12
+
 - Feature: Add ability to configure `terminationGracePeriodSeconds` for the Ambassador container
+- Update for Ambassador v1.9.0
 
 ## v6.5.11
 

diff --git a/Chart.yaml b/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-appVersion: 1.8.1
-ossVersion: 1.8.1
+appVersion: 1.9.0
+ossVersion: 1.9.0
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 6.5.11
+version: 6.5.12
 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.8.1`                                                                                             |
+| `image.tag`                                        | Ambassador image tag                                                                                                                                                     | `1.9.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
@@ -81,6 +81,11 @@ spec:
               - http
               - grpc
               type: string
+            protocol_version:
+              enum:
+              - v2
+              - v2alpha
+              type: string
             status_on_error:
               description: Why isn't this just an int??
               properties:

diff --git a/crds/getambassador.io_devportals.yaml b/crds/getambassador.io_devportals.yaml
@@ -0,0 +1,91 @@
+# GENERATED FILE: edits made by hand will not be preserved.
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.3.1-0.20200517180335-820a4a27ea84
+    helm.sh/hook: crd-install
+  labels:
+    app.kubernetes.io/name: ambassador
+    product: aes
+  name: devportals.getambassador.io
+spec:
+  group: getambassador.io
+  names:
+    categories:
+    - ambassador-crds
+    kind: DevPortal
+    listKind: DevPortalList
+    plural: devportals
+    singular: devportal
+  scope: Namespaced
+  validation:
+    openAPIV3Schema:
+      description: "DevPortal is the Schema for the DevPortals API \n DevPortal resources specify the `what` and `how` is shown in a DevPortal: \n * `what` is in a DevPortal can be controlled with   - a `selector`, that can be used for filtering `Mappings`.   - a `docs` listing of (services, url) * `how` is a pointer to some `contents` (a checkout of a Git repository   with go-templates/markdown/css). \n Multiple `DevPortal`s can exist in the cluster, and the Dev Portal server will show them at different endpoints. A `DevPortal` resource with a special name, `ambassador`, will be used for configuring the default Dev Portal (served at `/docs/` by default)."
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: DevPortalSpec defines the desired state of DevPortal
+          properties:
+            ambassador_id:
+              description: "AmbassadorID declares which Ambassador instances should pay attention to this resource.  May either be a string or a list of strings.  If no value is provided, the default is: \n    ambassador_id:    - \"default\""
+              items:
+                type: string
+              oneOf:
+              - type: string
+              - type: array
+            content:
+              description: Content specifies where the content shown in the DevPortal come from
+              properties:
+                branch:
+                  type: string
+                dir:
+                  type: string
+                url:
+                  type: string
+              type: object
+            default:
+              description: Default must be true when this is the default DevPortal
+              type: boolean
+            docs:
+              description: Docs is a static docs definition
+              items:
+                description: 'DevPortalDocsSpec is a static documentation definition: instead of using a Selector for finding documentation for services, users can provide a static list of <service>:<URL> tuples. These services will be shown in the Dev Portal with the documentation obtained from this URL.'
+                properties:
+                  service:
+                    description: Service is the service being documented
+                    type: string
+                  url:
+                    description: URL is the URL used for obtaining docs
+                    type: string
+                type: object
+              type: array
+            selector:
+              description: Selector is used for choosing what is shown in the DevPortal
+              properties:
+                matchLabels:
+                  additionalProperties:
+                    type: string
+                  description: MatchLabels specifies the list of labels that must be present in Mappings for being present in this DevPortal.
+                  type: object
+                matchNamespaces:
+                  description: MatchNamespaces is a list of namespaces that will be included in this DevPortal.
+                  items:
+                    type: string
+                  type: array
+              type: object
+          type: object
+      type: object
+  version: null
+  versions:
+  - name: v2
+    served: true
+    storage: true
diff --git a/crds/getambassador.io_mappings.yaml b/crds/getambassador.io_mappings.yaml
@@ -82,6 +82,9 @@ spec:
               type: boolean
             bypass_auth:
               type: boolean
+            bypass_error_response_overrides:
+              description: If true, bypasses any `error_response_overrides` set on the Ambassador module.
+              type: boolean
             case_sensitive:
               type: boolean
             circuit_breakers:
@@ -139,12 +142,56 @@ spec:
                   - type: string
                   - type: array
               type: object
+            docs:
+              description: DocsInfo provides some extra information about the docs for the Mapping (used by the Dev Portal)
+              properties:
+                ignored:
+                  type: boolean
+                path:
+                  type: string
+                url:
+                  type: string
+              type: object
             enable_ipv4:
               type: boolean
             enable_ipv6:
               type: boolean
             envoy_override:
               type: object
+            error_response_overrides:
+              description: Error response overrides for this Mapping. Replaces all of the `error_response_overrides` set on the Ambassador module, if any.
+              items:
+                description: A response rewrite for an HTTP error response
+                properties:
+                  body:
+                    description: The new response body
+                    properties:
+                      content_type:
+                        description: The content type to set on the error response body when using text_format or text_format_source. Defaults to 'text/plain'.
+                        type: string
+                      json_format:
+                        additionalProperties:
+                          type: string
+                        description: 'A JSON response with content-type: application/json. The values can contain format text like in text_format.'
+                        type: object
+                      text_format:
+                        description: A format string representing a text response body. Content-Type can be set using the `content_type` field below.
+                        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
+                    type: object
+                  on_status_code:
+                    description: The status code to match on
+                    maximum: 599
+                    minimum: 400
+                    type: integer
+                required:
+                - body
+                - on_status_code
+                type: object
+              minItems: 1
+              type: array
             grpc:
               type: boolean
             headers:

diff --git a/crds/getambassador.io_ratelimitservices.yaml b/crds/getambassador.io_ratelimitservices.yaml
@@ -44,6 +44,11 @@ spec:
               - type: array
             domain:
               type: string
+            protocol_version:
+              enum:
+              - v2
+              - v2alpha
+              type: string
             service:
               type: string
             timeout_ms:

diff --git a/crds/getambassador.io_tracingservices.yaml b/crds/getambassador.io_tracingservices.yaml
@@ -56,6 +56,8 @@ spec:
                   - HTTP_JSON
                   - HTTP_PROTO
                   type: string
+                collector_hostname:
+                  type: string
                 service_name:
                   type: string
                 shared_span_context:

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