edjusting test

th2-net · Aug 14, 2023 · c3ca1bd · c3ca1bd
1 parent dd70998
commit c3ca1bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/box-chart/templates/_ingress.yaml b/box-chart/templates/_ingress.yaml
@@ -3,7 +3,7 @@ Generating ingress rules for pod
 */}}
 {{- define "ingress" }}
 ---
-{{- if or (gt (len .Values.component.extendedSettings.service.ingress.urlPaths) 0) }}
+{{- if or (gt (len .Values.component.extendedSettings.service.clusterIP) 0)}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -27,7 +27,7 @@ spec:
       paths:
       {{- if and (.Values.component.extendedSettings.service.nodePort) (eq .Values.component.extendedSettings.service.enabled true) }}
       {{- range $path := .Values.component.extendedSettings.service.nodePort }}
-      - path: /{{ $.Release.Namespace }}/{{ trimAll "/" $path }}/{{ ternary "" "(.*)" $.Values.openshift.enabled }}
+      - path: /{{ $.Release.Namespace }}/{{ trimAll "/" $path.urlPath }}/{{ ternary "" "(.*)" $.Values.openshift.enabled }}
         pathType: Prefix
         backend:
           service:
@@ -37,7 +37,7 @@ spec:
       {{- end }}
       {{ else if and (.Values.component.extendedSettings.service.loadBalancer) (eq .Values.component.extendedSettings.service.enabled true) }}
       {{- range $path := .Values.component.extendedSettings.service.loadBalancer }}
-      - path: /{{ $.Release.Namespace }}/{{ trimAll "/" $path }}/{{ ternary "" "(.*)" $.Values.openshift.enabled }}
+      - path: /{{ $.Release.Namespace }}/{{ trimAll "/" $path.urlPath }}/{{ ternary "" "(.*)" $.Values.openshift.enabled }}
         pathType: Prefix
         backend:
           service:
@@ -47,7 +47,7 @@ spec:
       {{- end }}
       {{ else if and (.Values.component.extendedSettings.service.clusterIP) (eq .Values.component.extendedSettings.service.enabled true) }}
       {{- range $path := .Values.component.extendedSettings.service.clusterIP }}
-      - path: /{{ $.Release.Namespace }}/{{ trimAll "/" $path }}/{{ ternary "" "(.*)" $.Values.openshift.enabled }}
+      - path: /{{ $.Release.Namespace }}/{{ trimAll "/" $path.urlPath }}/{{ ternary "" "(.*)" $.Values.openshift.enabled }}
         pathType: Prefix
         backend:
           service:
@@ -100,6 +100,8 @@ spec:
               {{- range $path := .Values.component.extendedSettings.service.clusterIP }}
               number: {{ default "8080" $path.containerPort }}
             {{- end }}
+            {{ else }}
+              number: 8080
             {{- end }}
 {{- end }}
 {{- end }}
diff --git a/box-chart/tests/ingress_test.yaml b/box-chart/tests/ingress_test.yaml
@@ -24,7 +24,7 @@ tests:
             clusterIP: 
             - name: IP
               containerPort: 8081
-              urlPaths: /test/path/
+              urlPath: /test/path/
     asserts:
       - isKind:
           of: Ingress
@@ -44,7 +44,7 @@ tests:
               service:
                 name: testservice
                 port:
-                  number: 8080
+                  number: 8081
   - it: rpt-data-provider - common check
     documentIndex: 2
     set: