Ingress classname (#254)

apache · Mar 23, 2022 · b41e19e · b41e19e
1 parent bf241b7
commit b41e19e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/charts/apisix-dashboard/README.md b/charts/apisix-dashboard/README.md
@@ -99,14 +99,15 @@ The following tables lists the configurable parameters of the apisix-dashboard c
 
 ### Traffic Exposure parameters
 
-| Name                            | Description                                                                                            | Value                    |
-| ------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------ |
-| `service.type`                  | Service type                                                                                           | `ClusterIP`              |
-| `service.port`                  | Service HTTP port                                                                                      | `80`                     |
-| `ingress.enabled`               | Set to true to enable ingress record generation                                                        | `false`                  |
-| `ingress.annotations`           | Ingress annotations                                                                                    | `{}`                     |
-| `ingress.hosts`                 | The list of hostnames to be covered with this ingress record.                                          | `[]`                     |
-| `ingress.tls`                   | Create TLS Secret                                                                                      | `false`                  |
+| Name                            | Description                                                                                      | Value       |
+| ------------------------------- |--------------------------------------------------------------------------------------------------|-------------|
+| `service.type`                  | Service type                                                                                     | `ClusterIP` |
+| `service.port`                  | Service HTTP port                                                                                | `80`        |
+| `ingress.enabled`               | Set to true to enable ingress record generation                                                  | `false`     |
+| `ingress.annotations`           | Ingress annotations                                                                              | `{}`        |
+| `ingress.hosts`                 | The list of hostnames to be covered with this ingress record.                                    | `[]`        |
+| `ingress.tls`                   | Create TLS Secret                                                                                | `false`     |
+| `ingress.className`             | `ingressClassName` replace `annotations kubernetes.io/ingress.class`, required kubernetes 1.18>= | `apisix`    |
 
 ### RBAC parameters
 

diff --git a/charts/apisix-dashboard/templates/ingress.yaml b/charts/apisix-dashboard/templates/ingress.yaml
@@ -24,6 +24,9 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{- .Values.ingress.className -}}
+  {{- end }}
   name: {{ $fullName }}
   namespace: {{ .Release.Namespace }}
   labels:

diff --git a/charts/apisix-dashboard/values.yaml b/charts/apisix-dashboard/values.yaml
@@ -86,9 +86,16 @@ service:
 
 ingress:
   enabled: false
+  # Kubernetes 1.18+ support ingressClassName attribute
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
+  # domain access apisix example:
+  # hosts:
+  # - host: apisix-dashboard.local
+  #    paths:
+  #     - /*
   hosts:
     - host: apisix-dashboard.local
       paths: []