Merge pull request #159 from aandryashin/master

Add ingress class name.
aerokube · Jun 23, 2022 · 5337c6f · 5337c6f
2 parents eb0e6b2 + c0150d3
commit 5337c6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/moon2/templates/ingress.yaml b/moon2/templates/ingress.yaml
@@ -10,7 +10,9 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
 spec:
+  {{- if .Values.customIngress.ingressClassName }}
   ingressClassName: {{ .Values.customIngress.ingressClassName }}
+  {{- end }}
   {{- if .Values.customIngress.tls }}
   tls:
   {{ toYaml .Values.customIngress.tls | nindent 4 }}
@@ -132,7 +134,9 @@ spec:
     secretName: {{ $tlsSecretName }}
   {{- end }}
   {{- if not .Values.ingress.openshift }}
-  ingressClassName: nginx
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   {{- end }}
   rules:
   - host: {{ .Values.ingress.host }}
@@ -214,7 +218,9 @@ metadata:
     {{- end }}
 spec:
   {{- if not .Values.ingress.openshift }}
-  ingressClassName: nginx
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   {{- end }}
   {{- if $enableTLS }}
   tls:

diff --git a/moon2/values.yaml b/moon2/values.yaml
@@ -38,6 +38,11 @@ ingress:
   ##
   host: moon.aerokube.local
 
+  ##
+  ## Ingress class name
+  ##
+  ingressClassName: nginx
+
   ##
   ## Files with TLS certificate and TLS key. When provided Ingress switches to HTTPS-only mode.
   ## Set to empty files if you need HTTPS, but do not need to provide key and cert manually(i.g. use cert-manager)