From c652e7db50f0d92ce196182a88af21fade92ff27 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 20 Sep 2023 16:24:05 +0200
Subject: [PATCH] optional ingressClassName
---
src/main/helm/templates/ingress.yaml | 4 ++--
src/test/helm/ingress-nginx-tests.yaml | 23 ++++++++++++++---------
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index 0199f6603..05a61520a 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -36,8 +36,8 @@ metadata:
name: {{ include "app.name" . }}
namespace: {{ include "app.namespace" . }}
spec:
- {{- if ne (.Values).cluster_env "dataport"}}
- ingressClassName: nginx
+ {{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
+ ingressClassName: {{ .Values.ingress.className }}
{{- end }}
rules:
- http:
diff --git a/src/test/helm/ingress-nginx-tests.yaml b/src/test/helm/ingress-nginx-tests.yaml
index 22163d74e..ea2c48747 100644
--- a/src/test/helm/ingress-nginx-tests.yaml
+++ b/src/test/helm/ingress-nginx-tests.yaml
@@ -26,25 +26,19 @@ suite: test ingress options
templates:
- templates/ingress.yaml
tests:
- - it: should create afm ingress tls/ingressClass
+ - it: should create afm ingress tls
release:
name: afm-adapter
asserts:
- - equal:
- path: spec.ingressClassName
- value: nginx
- equal:
path: spec.tls[0].secretName
value: helm-afm-adapter-tls
- - it: should create afm ingress tls/ingressClass
+ - it: should create afm ingress tls
release:
name: fs-adapter
set:
image.name: formsolutions-adapter
asserts:
- - equal:
- path: spec.ingressClassName
- value: nginx
- equal:
path: spec.tls[0].secretName
value: helm-fs-adapter-tls
@@ -69,4 +63,15 @@ tests:
- isNull:
path: spec.ingressClassName
- isNull:
- path: spec.tls[0].secretName
\ No newline at end of file
+ path: spec.tls[0].secretName
+ - it: should not set ingressClassName
+ asserts:
+ - isNull:
+ path: spec.ingressClassName
+ - it: should set ingressClassName
+ set:
+ ingress.className: nginx
+ asserts:
+ - equal:
+ path: spec.ingressClassName
+ value: nginx
\ No newline at end of file
--
GitLab