mirror of
https://github.com/helm/charts.git
synced 2026-08-22 13:57:51 +00:00
[stable/ambassador] Number of improvements (#18516)
* Should leave getambassador.io/config uncommented to avoid confusion Signed-off-by: Noah Krause <krausenoah@gmail.com> * Redis is required for Ambassador Pro not just rl Signed-off-by: Noah Krause <krausenoah@gmail.com> * move crds to individual files in single dir Signed-off-by: Noah Krause <krausenoah@gmail.com> * Make crds.keep: false functional again Signed-off-by: Noah Krause <krausenoah@gmail.com> * crds.keep: false now works on pro Signed-off-by: Noah Krause <krausenoah@gmail.com> * bump chart version Signed-off-by: Noah Krause <krausenoah@gmail.com> * Only the release that creates crds can delete Signed-off-by: Noah Krause <krausenoah@gmail.com> * add ci test for crds creation/deletion Signed-off-by: Noah Krause <krausenoah@gmail.com> * Add clarification to values.yaml Signed-off-by: Noah Krause <krausenoah@gmail.com> * Update readme with notes on the crds flags Signed-off-by: Noah Krause <krausenoah@gmail.com> * trailing spaces are dumb Signed-off-by: Noah Krause <krausenoah@gmail.com> * fix startup error Signed-off-by: Noah Krause <krausenoah@gmail.com>
This commit is contained in:
Noah Krause
committed by
Kubernetes Prow Robot
Kubernetes Prow Robot
parent
367299e6f9
commit
132cd16d84
@@ -2,7 +2,7 @@ apiVersion: v1
|
||||
appVersion: 0.85.0
|
||||
description: A Helm chart for Datawire Ambassador
|
||||
name: ambassador
|
||||
version: 4.4.4
|
||||
version: 4.4.5
|
||||
icon: https://www.getambassador.io/images/logo.png
|
||||
home: https://www.getambassador.io/
|
||||
sources:
|
||||
|
||||
@@ -121,6 +121,18 @@ The following tables lists the configurable parameters of the Ambassador chart a
|
||||
|
||||
**NOTE:** Make sure the configured `service.http.targetPort` and `service.https.targetPort` ports match your [Ambassador Module's](https://www.getambassador.io/reference/modules/#the-ambassador-module) `service_port` and `redirect_cleartext_from` configurations.
|
||||
|
||||
### CRDs
|
||||
|
||||
This helm chart includes the creation of the core CRDs Ambassador uses for
|
||||
configuration.
|
||||
|
||||
The `crds` flags let you configure how a release manages crds.
|
||||
- `crds.create` Can only be set on your first/master Ambassador release.
|
||||
- `crds.enabled` Should be set on all releases using Ambassador CRDs
|
||||
- `crds.keep` Configures if the CRDs are deleted when the master release is
|
||||
purged. This value is only checked for the master release and can be set to
|
||||
any value on secondary releases.
|
||||
|
||||
### Annotations
|
||||
|
||||
Ambassador configuration is done through annotations on Kubernetes services or Custom Resource Definitions (CRDs). The `service.annotations` section of the values file contains commented out examples of [Ambassador Module](https://www.getambassador.io/reference/core/ambassador) and a global [TLSContext](https://www.getambassador.io/reference/core/tls) configurations which are typically created in the Ambassador service.
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
env:
|
||||
AMBASSADOR_NO_KUBEWATCH: no_kubewatch
|
||||
|
||||
crds:
|
||||
create: true
|
||||
keep: false
|
||||
@@ -1,73 +0,0 @@
|
||||
{{- if .Values.pro.enabled -}}
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: filterpolicies.getambassador.io
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1beta2
|
||||
versions:
|
||||
- name: v1beta2
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: filterpolicies
|
||||
singular: filterpolicy
|
||||
kind: FilterPolicy
|
||||
shortNames:
|
||||
- fp
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: filters.getambassador.io
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1beta2
|
||||
versions:
|
||||
- name: v1beta2
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: filters
|
||||
singular: filter
|
||||
kind: Filter
|
||||
shortNames:
|
||||
- fil
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: ratelimits.getambassador.io
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1beta1
|
||||
versions:
|
||||
- name: v1beta1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: ratelimits
|
||||
singular: ratelimit
|
||||
kind: RateLimit
|
||||
shortNames:
|
||||
- rl
|
||||
{{- end -}}
|
||||
@@ -1,5 +1,4 @@
|
||||
{{ if and .Values.pro.enabled .Values.pro.rateLimit.enabled }}
|
||||
{{- if .Values.crds.enabled }}
|
||||
{{ if and .Values.pro.enabled .Values.crds.enabled }}
|
||||
---
|
||||
apiVersion: getambassador.io/v1
|
||||
kind: RateLimitService
|
||||
@@ -10,58 +9,4 @@ spec:
|
||||
ambassador_id: {{ .Values.env.AMBASSADOR_ID | quote }}
|
||||
{{- end }}
|
||||
service: 127.0.0.1:{{ .Values.pro.ports.ratelimit }}
|
||||
|
||||
{{- end }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
{{- toYaml .Values.pro.rateLimit.redis.annotations.service | nindent 4}}
|
||||
spec:
|
||||
type: ClusterIP
|
||||
ports:
|
||||
- port: 6379
|
||||
targetPort: 6379
|
||||
selector:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
{{- toYaml .Values.pro.rateLimit.redis.annotations.deployment | nindent 4}}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
spec:
|
||||
containers:
|
||||
- name: redis
|
||||
image: redis:5.0.1
|
||||
restartPolicy: Always
|
||||
resources:
|
||||
{{- toYaml .Values.pro.rateLimit.redis.resources | nindent 8 }}
|
||||
{{ end }}
|
||||
@@ -0,0 +1,54 @@
|
||||
{{ if and .Values.pro.enabled }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
{{- toYaml .Values.pro.rateLimit.redis.annotations.service | nindent 4}}
|
||||
spec:
|
||||
type: ClusterIP
|
||||
ports:
|
||||
- port: 6379
|
||||
targetPort: 6379
|
||||
selector:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
{{- toYaml .Values.pro.rateLimit.redis.annotations.deployment | nindent 4}}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.fullname" . }}-pro-redis
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
spec:
|
||||
containers:
|
||||
- name: redis
|
||||
image: redis:5.0.1
|
||||
resources:
|
||||
{{- toYaml .Values.pro.rateLimit.redis.resources | nindent 10 }}
|
||||
restartPolicy: Always
|
||||
{{ end }}
|
||||
@@ -0,0 +1,40 @@
|
||||
{{- if and .Values.crds.enabled (not .Values.crds.keep)}}
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
metadata:
|
||||
name: {{ include "ambassador.fullname" . }}-crd-cleanup
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
"helm.sh/hook": pre-delete
|
||||
"helm.sh/hook-weight": "3"
|
||||
"helm.sh/hook-delete-policy": hook-succeeded
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
spec:
|
||||
template:
|
||||
metadata:
|
||||
name: {{ include "ambassador.fullname" . }}-crd-cleanup
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
spec:
|
||||
{{- if .Values.rbac.create }}
|
||||
serviceAccountName: {{ include "ambassador.serviceAccountName" . }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: kubectl
|
||||
image: "k8s.gcr.io/hyperkube:v1.12.1"
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- >
|
||||
kubectl delete crds -l app.kubernetes.io/part-of={{ .Release.Name }}
|
||||
restartPolicy: OnFailure
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: authservices.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: authservices
|
||||
singular: authservice
|
||||
kind: AuthService
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: consulresolvers.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: consulresolvers
|
||||
singular: consulresolver
|
||||
kind: ConsulResolver
|
||||
{{- end }}
|
||||
@@ -0,0 +1,29 @@
|
||||
{{- if .Values.pro.enabled -}}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: filters.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1beta2
|
||||
versions:
|
||||
- name: v1beta2
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: filters
|
||||
singular: filter
|
||||
kind: Filter
|
||||
shortNames:
|
||||
- fil
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,29 @@
|
||||
{{- if .Values.pro.enabled -}}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: filterpolicies.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1beta2
|
||||
versions:
|
||||
- name: v1beta2
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: filterpolicies
|
||||
singular: filterpolicy
|
||||
kind: FilterPolicy
|
||||
shortNames:
|
||||
- fp
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: kubernetesendpointresolvers.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: kubernetesendpointresolvers
|
||||
singular: kubernetesendpointresolver
|
||||
kind: KubernetesEndpointResolver
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: kubernetesserviceresolvers.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: kubernetesserviceresolvers
|
||||
singular: kubernetesserviceresolver
|
||||
kind: KubernetesServiceResolver
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: mappings.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: mappings
|
||||
singular: mapping
|
||||
kind: Mapping
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: modules.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: modules
|
||||
singular: module
|
||||
kind: Module
|
||||
{{- end }}
|
||||
@@ -0,0 +1,29 @@
|
||||
{{- if .Values.pro.enabled -}}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: ratelimits.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1beta1
|
||||
versions:
|
||||
- name: v1beta1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: ratelimits
|
||||
singular: ratelimit
|
||||
kind: RateLimit
|
||||
shortNames:
|
||||
- rl
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: ratelimitservices.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: ratelimitservices
|
||||
singular: ratelimitservice
|
||||
kind: RateLimitService
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: tcpmappings.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: tcpmappings
|
||||
singular: tcpmapping
|
||||
kind: TCPMapping
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: tlscontexts.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: tlscontexts
|
||||
singular: tlscontext
|
||||
kind: TLSContext
|
||||
{{- end }}
|
||||
@@ -0,0 +1,27 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: tracingservices.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: tracingservices
|
||||
singular: tracingservice
|
||||
kind: TracingService
|
||||
{{- end }}
|
||||
@@ -25,7 +25,12 @@ rules:
|
||||
- kubernetesendpointresolvers.getambassador.io
|
||||
- kubernetesserviceresolvers.getambassador.io
|
||||
- consulresolvers.getambassador.io
|
||||
verbs: ["get", "list", "watch"]
|
||||
{{- if .Values.pro.enabled }}
|
||||
- filters.getambassador.io
|
||||
- filterpolicies.getambassador.io
|
||||
- ratelimits.getambassador.io
|
||||
{{- end }}
|
||||
verbs: ["get", "list", "watch", "delete"]
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
||||
kind: ClusterRoleBinding
|
||||
|
||||
@@ -1,281 +0,0 @@
|
||||
{{- if .Values.crds.create }}
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: authservices.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: authservices
|
||||
singular: authservice
|
||||
kind: AuthService
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: consulresolvers.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"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" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"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" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"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:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: mappings
|
||||
singular: mapping
|
||||
kind: Mapping
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: modules.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: modules
|
||||
singular: module
|
||||
kind: Module
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: ratelimitservices.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: ratelimitservices
|
||||
singular: ratelimitservice
|
||||
kind: RateLimitService
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: tcpmappings.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: tcpmappings
|
||||
singular: tcpmapping
|
||||
kind: TCPMapping
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: tlscontexts.getambassador.io
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ include "ambassador.name" . }}
|
||||
app.kubernetes.io/part-of: {{ .Release.Name }}
|
||||
helm.sh/chart: {{ include "ambassador.chart" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: tlscontexts
|
||||
singular: tlscontext
|
||||
kind: TLSContext
|
||||
---
|
||||
apiVersion: apiextensions.k8s.io/v1beta1
|
||||
kind: CustomResourceDefinition
|
||||
metadata:
|
||||
name: tracingservices.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 }}
|
||||
annotations:
|
||||
"helm.sh/hook": crd-install
|
||||
{{ if .Values.crds.keep }}
|
||||
"helm.sh/resource-policy": keep
|
||||
{{ end }}
|
||||
spec:
|
||||
group: getambassador.io
|
||||
version: v1
|
||||
versions:
|
||||
- name: v1
|
||||
served: true
|
||||
storage: true
|
||||
scope: Namespaced
|
||||
names:
|
||||
plural: tracingservices
|
||||
singular: tracingservice
|
||||
kind: TracingService
|
||||
{{- end }}
|
||||
@@ -80,9 +80,15 @@ service:
|
||||
# nodePort: 30222
|
||||
|
||||
annotations:
|
||||
# Uncomment out fields you want to use.
|
||||
# See https://www.getambassador.io/reference/core/ambassador and
|
||||
# https://www.getambassador.io/reference/core/tls for more info
|
||||
#############################################################################
|
||||
## Ambassador should be configured using CRD definition. If you want
|
||||
## to use annotations, the following is an example of annotating the
|
||||
## Ambassador service with global configuration manifest.
|
||||
##
|
||||
## See https://www.getambassador.io/reference/core/ambassador and
|
||||
## https://www.getambassador.io/reference/core/tls for more info
|
||||
#############################################################################
|
||||
#
|
||||
# getambassador.io/config: |
|
||||
# ---
|
||||
# apiVersion: ambassador/v1
|
||||
|
||||
Reference in New Issue
Block a user