Merge remote-tracking branch 'codesh/OZG-7121-ssl-passthrough' into...

Merge remote-tracking branch 'codesh/OZG-7121-ssl-passthrough' into 2-OZG-7121-KOP-2850-Dev-Deployment

src/main/helm/templates/certificate.yaml

@@ -40,5 +40,4 @@ spec:
     - key encipherment
     - key agreement
   dnsNames:
-    - "{{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }}"
     - "{{ .Release.Name }}-{{ include "app.baseDomain" . }}"
\ No newline at end of file

src/main/helm/templates/ingress.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ .Release.Name }}
   namespace: {{ include "app.namespace" . }}
   annotations:
-    haproxy-ingress.github.io/ssl-passthrough: "true"
+    route.openshift.io/termination: passthrough
 spec:
   {{- if (.Values.ingress).className }}
   ingressClassName: {{ .Values.ingress.className }}
@@ -13,8 +13,8 @@ spec:
     - host: "{{ .Release.Name }}-{{ include "app.baseDomain" . }}"
       http:
         paths:
-          - path: /
-            pathType: Prefix
+          - path: ""
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ .Release.Name }}

src/main/helm/templates/route.yaml

-kind: Route
-apiVersion: route.openshift.io/v1
-metadata:
-  name: {{ .Release.Name }}-passthrough
-  namespace: {{ include "app.namespace" . }}
-
-spec:
-  host: {{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }}
-  to:
-    kind: Service
-    name: {{ .Release.Name }}
-    weight: 100
-  port:
-    targetPort: 8443
-  tls:
-    termination: passthrough
-  wildcardPolicy: None
-status:
-  ingress:
-    - host: {{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }}
-      routerName: {{ .Values.router.name }}
-      wildcardPolicy: None
-      routerCanonicalHostname: {{ .Values.router.hostname }}

src/test/helm/certificate_test.yaml

@@ -63,7 +63,6 @@ tests:
       - equal:
           path: spec.dnsNames
           value:
-            - "xta-test-server-release-name-passthrough-helm.test.by.ozg-cloud.de"
             - "xta-test-server-release-name-helm.test.by.ozg-cloud.de"
   - it: should contain default lables and component lables
     asserts:

src/test/helm/ingress_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test ingress.yaml
 release:
-  name: matabase
+  name: xta-test-server
   namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
@@ -41,8 +41,8 @@ tests:
   - it: should enable ssl passthrough
     asserts:
       - equal:
-          path: metadata.annotations["haproxy-ingress.github.io/ssl-passthrough"]
-          value: "true"
+          path: metadata.annotations["route.openshift.io/termination"]
+          value: "passthrough"
 
   - it: should not create ingress tls/ingressClass by default
     asserts:
@@ -61,11 +61,11 @@ tests:
       - equal:
           path: spec.rules[0].http.paths[0]
           value: 
-              path: /
-              pathType: Prefix
+              path: ""
+              pathType: ImplementationSpecific
               backend:
                 service:
-                  name: matabase
+                  name: xta-test-server
                   port: 
                     number: 8443
 
@@ -73,4 +73,4 @@ tests:
     asserts:
       - equal:
           path: spec.rules[0].host
-          value: matabase-helm.test.by.ozg-cloud.de
+          value: xta-test-server-helm.test.by.ozg-cloud.de

src/test/helm/route_test.yaml

-suite: test route.yaml
-release:
-  name: releasename
-  namespace: sh-helm-test
-templates:
-  - templates/route.yaml
-set:  
-  ozgcloud:
-    bezeichner: helm
-  baseUrl: test.by.ozg-cloud.de
-
-tests:
-  - it: check route kind
-    asserts:
-      - isKind:
-          of: Route
-  - it: should set passthrough hostname
-    asserts:
-      - equal:
-          path: spec.host
-          value: releasename-passthrough-helm.test.by.ozg-cloud.de
-  - it: should set service name
-    asserts:
-      - equal:
-          path: spec.to.name
-          value: releasename
-  - it: should set target port
-    asserts:
-      - equal:
-          path: spec.port.targetPort
-          value: 8443
-  - it: should set passthrough tls termination
-    asserts:
-      - equal:
-          path: spec.tls.termination
-          value: passthrough
-
-  - it: should set ingress passthrough hostname
-    asserts:
-      - equal:
-          path: status.ingress[0].host
-          value: releasename-passthrough-helm.test.by.ozg-cloud.de
-  - it: should set router name
-    asserts:
-      - equal:
-          path: status.ingress[0].routerName
-          value: default
-  - it: should set router hostname
-    asserts:
-      - equal:
-          path: status.ingress[0].routerCanonicalHostname
-          value: router-default.apps.okd.dev.by.ozg-cloud.systems