Merge pull request #7 from mkilchhofer/feature/ingressClassName

feat: Ability to set ingressClassName
mkilchhofer · Apr 8, 2024 · abd540a · abd540a
2 parents 4f11c4c + 680adc1
commit abd540a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/charts/unifi/Chart.yaml b/charts/unifi/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v7.5.176
 kubeVersion: ">=1.18-0"
 description: Ubiquiti Network's Unifi Controller
 name: unifi
-version: 1.8.0
+version: 1.9.0
 keywords:
  - ubiquiti
  - unifi

diff --git a/charts/unifi/README.md b/charts/unifi/README.md
@@ -105,6 +105,7 @@ ingress:
 | captivePortalService.ingress.annotations | object | `{}` | Annotations for Ingress resource |
 | captivePortalService.ingress.enabled | bool | `false` | Enable Ingress resource |
 | captivePortalService.ingress.hosts | list | `["unifi-captive.example.com"]` | Hostname(s) for the Ingress resource |
+| captivePortalService.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
 | captivePortalService.ingress.path | string | `"/"` | Ingress path |
 | captivePortalService.ingress.tls | list | `[]` | Ingress TLS configuration |
 | captivePortalService.labels | object | `{}` | Labels to add to the captive portal service |
@@ -117,6 +118,7 @@ ingress:
 | controllerService.ingress.annotations | object | `{}` | Annotations for Ingress resource |
 | controllerService.ingress.enabled | bool | `false` | Enable Ingress resource |
 | controllerService.ingress.hosts | list | `["unifi-controller.example.com"]` | Hostname(s) for the Ingress resource |
+| controllerService.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
 | controllerService.ingress.path | string | `"/"` | Ingress path |
 | controllerService.ingress.tls | list | `[]` | Ingress TLS configuration |
 | controllerService.labels | object | `{}` | Labels to add to the controller service |
@@ -157,6 +159,7 @@ ingress:
 | ingress.annotations | object | `{}` | Annotations for Ingress resource |
 | ingress.enabled | bool | `true` | Enable Ingress resource |
 | ingress.hosts | list | `["unifi.example.com"]` | Hostname(s) for the Ingress resource |
+| ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
 | ingress.path | string | `"/"` | Ingress path |
 | ingress.tls | list | `[]` | Ingress TLS configuration |
 | jvmInitHeapSize | string | `""` | Java Virtual Machine (JVM) initial, and minimum, heap size. Unset value means there is no lower limit |

diff --git a/charts/unifi/templates/captive-ingress.yaml b/charts/unifi/templates/captive-ingress.yaml
@@ -11,6 +11,9 @@ metadata:
  labels:
  {{- include "unifi.labels" . | nindent 4 }}
 spec:
+ {{- with .Values.captivePortalService.ingress.ingressClassName }}
+ ingressClassName: {{ . }}
+ {{- end }}
  rules:
  {{- range .Values.captivePortalService.ingress.hosts }}
  - host: {{ . }}

diff --git a/charts/unifi/templates/controller-ingress.yaml b/charts/unifi/templates/controller-ingress.yaml
@@ -11,6 +11,9 @@ metadata:
  labels:
  {{- include "unifi.labels" . | nindent 4 }}
 spec:
+ {{- with .Values.controllerService.ingress.ingressClassName }}
+ ingressClassName: {{ . }}
+ {{- end }}
  rules:
  {{- range .Values.controllerService.ingress.hosts }}
  - host: {{ . }}

diff --git a/charts/unifi/templates/ingress.yaml b/charts/unifi/templates/ingress.yaml
@@ -11,6 +11,9 @@ metadata:
  labels:
  {{- include "unifi.labels" . | nindent 4 }}
 spec:
+ {{- with .Values.ingress.ingressClassName }}
+ ingressClassName: {{ . }}
+ {{- end }}
  rules:
  {{- range .Values.ingress.hosts }}
  - host: {{ . }}

diff --git a/charts/unifi/values.yaml b/charts/unifi/values.yaml
@@ -103,6 +103,8 @@ captivePortalService:
  ingress:
  # -- Enable Ingress resource
  enabled: false
+ # -- Defines which ingress controller will implement the resource
+ ingressClassName: ""
  # -- Annotations for Ingress resource
  annotations: {}
  # -- Ingress path
@@ -141,6 +143,8 @@ controllerService:
  ingress:
  # -- Enable Ingress resource
  enabled: false
+ # -- Defines which ingress controller will implement the resource
+ ingressClassName: ""
  # -- Annotations for Ingress resource
  annotations: {}
  # -- Ingress path
@@ -243,6 +247,8 @@ speedtestService:
 ingress:
  # -- Enable Ingress resource
  enabled: true
+ # -- Defines which ingress controller will implement the resource
+ ingressClassName: ""
  # -- Annotations for Ingress resource
  annotations: {}
  # -- Ingress path