Browse Source

Ambassador can watch multiple namespaces (#7516)

* Ambassador can watch multiple namespaces

* update variable name per PR review
pull/7538/head
Ian Martin 4 years ago
committed by GitHub
parent
commit
38d9d2ea0e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
  1. 1
      inventory/sample/group_vars/k8s-cluster/addons.yml
  2. 4
      roles/kubernetes-apps/ingress_controller/ambassador/README.md
  3. 3
      roles/kubernetes-apps/ingress_controller/ambassador/defaults/main.yml
  4. 4
      roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2

1
inventory/sample/group_vars/k8s-cluster/addons.yml

@ -115,6 +115,7 @@ ingress_publish_status_address: ""
ingress_ambassador_enabled: false ingress_ambassador_enabled: false
# ingress_ambassador_namespace: "ambassador" # ingress_ambassador_namespace: "ambassador"
# ingress_ambassador_version: "*" # ingress_ambassador_version: "*"
# ingress_ambassador_multi_namespaces: false
# ALB ingress controller deployment # ALB ingress controller deployment
ingress_alb_enabled: false ingress_alb_enabled: false

4
roles/kubernetes-apps/ingress_controller/ambassador/README.md

@ -29,6 +29,10 @@ versions of Ambassador as they become available.
for specifying when the Operator should try to update the Ambassador API Gateway. for specifying when the Operator should try to update the Ambassador API Gateway.
- `ingress_ambassador_version` (defaulkt: `*`): SemVer rule for versions allowed for - `ingress_ambassador_version` (defaulkt: `*`): SemVer rule for versions allowed for
installation/updates. installation/updates.
- `ingress_ambassador_multi_namespaces` (default `false`): By default, Ambassador will only
watch the `ingress_ambassador_namespace` namespace for `AmbassadorInstallation` CRD resources.
When set to `true`, this value will tell the Ambassador Operator to watch **all** namespaces
for CRDs. If you want to run multiple Ambassador ingress instances, set this to `true`.
## Ingress annotations ## Ingress annotations

3
roles/kubernetes-apps/ingress_controller/ambassador/defaults/main.yml

@ -6,4 +6,5 @@ ingress_ambassador_replicas: 1
ingress_ambassador_insecure_port: 80 ingress_ambassador_insecure_port: 80
ingress_ambassador_secure_port: 443 ingress_ambassador_secure_port: 443
ingress_ambassador_extra_args: [] ingress_ambassador_extra_args: []
ingress_ambassador_host_network: false
ingress_ambassador_host_network: false
ingress_ambassador_multi_namespaces: false

4
roles/kubernetes-apps/ingress_controller/ambassador/templates/deploy-ambassador.yml.j2

@ -32,9 +32,13 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }} imagePullPolicy: {{ k8s_image_pull_policy }}
env: env:
- name: WATCH_NAMESPACE - name: WATCH_NAMESPACE
{%- if ingress_ambassador_multi_namespaces %}
value: ''
{%- else %}
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{%- end %}
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:

Loading…
Cancel
Save