From 9b8614d138356cadce022b8541ec3ba17c63efc3 Mon Sep 17 00:00:00 2001 From: Tom Kerkhove Date: Fri, 13 Oct 2023 15:26:30 +0200 Subject: [PATCH] feat: Provide capability to configure DNS suffix for ingress controller (#258) Signed-off-by: Tom Kerkhove --- helm-charts/azure-api-management-gateway/README.md | 5 +++++ .../azure-api-management-gateway/templates/configmap.yaml | 1 + helm-charts/azure-api-management-gateway/values.yaml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/helm-charts/azure-api-management-gateway/README.md b/helm-charts/azure-api-management-gateway/README.md index 0edf814..391d12e 100644 --- a/helm-charts/azure-api-management-gateway/README.md +++ b/helm-charts/azure-api-management-gateway/README.md @@ -135,6 +135,11 @@ their default values. | `ingress.tls` | Configuration for TLS on the ingress | None | | `ingress.ingressClassName` | Configuration of the ingress class to be used | | | `ingress.useHttpsBackend` | Indication whether or not the https port of the service should be used | `false` | +| `ingress.controller.enabled` | Indication whether or not Self-Hosted gateway should act as an Ingress controller. ([experimental feature])(https://github.com/Azure/api-management-self-hosted-gateway-ingress) | `false` | +| `ingress.controller.namespace` | Kubernetes namespace to watch. ([experimental feature])(https://github.com/Azure/api-management-self-hosted-gateway-ingress) | `default` | +| `ingress.controller.annotations` | Indication whether or not Self-Hosted gateway should act as an Ingress controller. ([experimental feature])(https://github.com/Azure/api-management-self-hosted-gateway-ingress) | `[]` | +| `ingress.controller.dns.suffix` | DNS suffix to use to build Kubernetes hostname for services inside the cluster. ([experimental feature])(https://github.com/Azure/api-management-self-hosted-gateway-ingress) | `svc.cluster.local` | +| `ingress.controller.ingressClass.annotations` | Annotationts to apply to ingress class ([experimental feature])(https://github.com/Azure/api-management-self-hosted-gateway-ingress) | `[]`| | `serviceAccountName` | Configuration of the serviceAccountName used | default | | `highAvailability.enabled` | Indication whether or not the gateway should be scheduled highly available in the cluster. | `false` | | `highAvailability.disruption.maximumUnavailable` | Amount of pods that are allowed to be unavailable due to [voluntary disruptions](https://kubernetes.io/docs/concepts/workloads/pods/disruptions/#voluntary-and-involuntary-disruptions). | `25%` | diff --git a/helm-charts/azure-api-management-gateway/templates/configmap.yaml b/helm-charts/azure-api-management-gateway/templates/configmap.yaml index 184f796..dde7c51 100644 --- a/helm-charts/azure-api-management-gateway/templates/configmap.yaml +++ b/helm-charts/azure-api-management-gateway/templates/configmap.yaml @@ -22,6 +22,7 @@ data: {{- if .Values.ingress.controller.enabled }} k8s.ingress.enabled : {{ .Values.ingress.controller.enabled | quote }} k8s.ingress.namespace : {{ .Values.ingress.controller.namespace | default ( .Release.Namespace ) | quote }} + k8s.ingress.dns.suffix: {{ .Values.ingress.controller.dns.suffix | quote }} {{- end }} telemetry.metrics.cloud: {{ .Values.observability.azureMonitor.metrics.enabled | quote }} telemetry.logs.std: {{ .Values.observability.logs.std.format | quote }} diff --git a/helm-charts/azure-api-management-gateway/values.yaml b/helm-charts/azure-api-management-gateway/values.yaml index 9bb0b73..5ae75e9 100644 --- a/helm-charts/azure-api-management-gateway/values.yaml +++ b/helm-charts/azure-api-management-gateway/values.yaml @@ -132,6 +132,8 @@ ingress: enabled: false namespace: "" annotations: [] + dns: + suffix: "svc.cluster.local" ingressClass: controller: "azure-api-management/gateway" annotations: []