diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml index 76aac3a6a3469cf42d22e2ad56f857b5b961260f..7ac0e72801f769045b063a333c1c706f12655bae 100644 --- a/src/main/helm/templates/certificate.yaml +++ b/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 diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml index 33678224adc6ee660b0a705a0350227c6ca08e7f..f56f06ad65d67bb9b572a329c851bb9811b9619d 100644 --- a/src/main/helm/templates/ingress.yaml +++ b/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 }} diff --git a/src/main/helm/templates/route.yaml b/src/main/helm/templates/route.yaml deleted file mode 100644 index 0f86471e20d37042968af11b9d2e1a0a3666c69b..0000000000000000000000000000000000000000 --- a/src/main/helm/templates/route.yaml +++ /dev/null @@ -1,23 +0,0 @@ -kind: Route -apiVersion: route.openshift.io/v1 -metadata: - name: {{ .Release.Name }}-passthrough - namespace: by-enable-dev - -spec: - host: {{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }} - to: - kind: Service - name: xta-test-server - weight: 100 - port: - targetPort: 8443 - tls: - termination: passthrough - wildcardPolicy: None -status: - ingress: - - host: {{ .Release.Name }}-passthrough-{{ include "app.baseDomain" . }} - routerName: default - wildcardPolicy: None - routerCanonicalHostname: router-default.apps.okd.dev.by.ozg-cloud.systems diff --git a/src/test/helm/ingress_test.yaml b/src/test/helm/ingress_test.yaml index 668a3e7a24e986ec74c200ae106834b9424872b3..8a67ad48191572b1e7b3f726c9bf5fd4d99d76e4 100644 --- a/src/test/helm/ingress_test.yaml +++ b/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