From 73d7e7dcacd8309eed9168cb1573eeb392ebda44 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Fri, 7 Jun 2019 10:34:00 -0400 Subject: [PATCH] [stable/chart] Added CRDs for Resolvers (#14594) * Added CRDs for ConsulResolver, KubernetesEndpointResolver, and KubernetesServiceResolver Signed-off-by: James Thompson * Bumped chart version Signed-off-by: James Thompson * bumped image to 0.71.0 Signed-off-by: James Thompson * added proper labels and annotations to match existing CRDs Signed-off-by: James Thompson * update ambassador version everywhere Signed-off-by: James Thompson --- stable/ambassador/Chart.yaml | 4 +- stable/ambassador/README.md | 2 +- stable/ambassador/templates/crds.yaml | 78 +++++++++++++++++++++++++++ stable/ambassador/values.yaml | 2 +- 4 files changed, 82 insertions(+), 4 deletions(-) diff --git a/stable/ambassador/Chart.yaml b/stable/ambassador/Chart.yaml index c7018fe7f0..da6fe34b67 100644 --- a/stable/ambassador/Chart.yaml +++ b/stable/ambassador/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: 0.70.1 +appVersion: 0.71.0 description: A Helm chart for Datawire Ambassador name: ambassador -version: 2.7.0 +version: 2.8.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 b0bdf7f9d3..adb7c6e431 100755 --- a/stable/ambassador/README.md +++ b/stable/ambassador/README.md @@ -56,7 +56,7 @@ The following tables lists the configurable parameters of the Ambassador chart a | `env` | Any additional environment variables for ambassador pods | `{}` | | `image.pullPolicy` | Ambassador image pull policy | `IfNotPresent` | | `image.repository` | Ambassador image | `quay.io/datawire/ambassador` | -| `image.tag` | Ambassador image tag | `0.70.1` | +| `image.tag` | Ambassador image tag | `0.71.0` | | `imagePullSecrets` | Image pull secrets | `[]` | | `namespace.name` | Set the `AMBASSADOR_NAMESPACE` environment variable | `metadata.namespace` | | `scope.singleNamespace` | Set the `AMBASSADOR_SINGLE_NAMESPACE` environment variable | `false` | diff --git a/stable/ambassador/templates/crds.yaml b/stable/ambassador/templates/crds.yaml index 49e79adb11..02462d14f7 100644 --- a/stable/ambassador/templates/crds.yaml +++ b/stable/ambassador/templates/crds.yaml @@ -28,6 +28,84 @@ spec: --- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition +metadata: + name: consulresolvers.getambassador.io + labels: + app.kubernetes.io/name: {{ include "ambassador.name" . }} + helm.sh/chart: {{ include "ambassador.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + {{ if .Values.crds.keep }} + annotations: + "helm.sh/resource-policy": keep + {{ end }} +spec: + group: getambassador.io + version: v1 + versions: + - name: v1 + served: true + storage: true + scope: Namespaced + names: + plural: consulresolvers + singular: consulresolver + kind: ConsulResolver +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: kubernetesendpointresolvers.getambassador.io + labels: + app.kubernetes.io/name: {{ include "ambassador.name" . }} + helm.sh/chart: {{ include "ambassador.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + {{ if .Values.crds.keep }} + annotations: + "helm.sh/resource-policy": keep + {{ end }} +spec: + group: getambassador.io + version: v1 + versions: + - name: v1 + served: true + storage: true + scope: Namespaced + names: + plural: kubernetesendpointresolvers + singular: kubernetesendpointresolver + kind: KubernetesEndpointResolver +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: kubernetesserviceresolvers.getambassador.io + labels: + app.kubernetes.io/name: {{ include "ambassador.name" . }} + helm.sh/chart: {{ include "ambassador.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + {{ if .Values.crds.keep }} + annotations: + "helm.sh/resource-policy": keep + {{ end }} +spec: + group: getambassador.io + version: v1 + versions: + - name: v1 + served: true + storage: true + scope: Namespaced + names: + plural: kubernetesserviceresolvers + singular: kubernetesserviceresolver + kind: KubernetesServiceResolver +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition metadata: name: mappings.getambassador.io labels: diff --git a/stable/ambassador/values.yaml b/stable/ambassador/values.yaml index 4307630a45..5d41a652cc 100644 --- a/stable/ambassador/values.yaml +++ b/stable/ambassador/values.yaml @@ -46,7 +46,7 @@ securityContext: image: repository: quay.io/datawire/ambassador - tag: 0.70.1 + tag: 0.71.0 pullPolicy: IfNotPresent nameOverride: ""