Ingress controller rework

helm/i40-aas/templates/adapter-registry.yaml

@@ -6,6 +6,8 @@ metadata:
   labels: 
     service: adapter-registry
     {{- include "i40-aas.labels" . | nindent 4 }}
+  annotations:
+    ingress.kubernetes.io/path-rewrite: "/([^/]*)(/?.*) \\2"
 spec:
   clusterIP: None
   ports:

helm/i40-aas/templates/data-manager.yaml

@@ -6,6 +6,8 @@ metadata:
   labels: 
     service: data-manager
     {{- include "i40-aas.labels" . | nindent 4 }}
+  annotations:
+    ingress.kubernetes.io/path-rewrite: "/([^/]*)(/?.*) \\2"
 spec:
   ports:
   - targetPort: endpoint

helm/i40-aas/templates/endpoint-registry.yaml

@@ -6,6 +6,8 @@ metadata:
   labels:
     service: endpoint-registry
     {{- include "i40-aas.labels" . | nindent 4 }}
+  annotations:
+    ingress.kubernetes.io/path-rewrite: "/([^/]*)(/?.*) \\2"
 spec:
   ports:
   - targetPort: endpoint

helm/i40-aas/templates/https-endpoint-ingress.yaml

@@ -6,6 +6,8 @@ metadata:
   labels: 
     service: https-endpoint-ingress
     {{- include "i40-aas.labels" . | nindent 4 }}
+  annotations:
+    ingress.kubernetes.io/path-rewrite: "/([^/]*)(/?.*) \\2"
 spec:
   ports:
     - targetPort: endpoint

helm/i40-aas/templates/ingress.yaml

@@ -6,11 +6,9 @@ metadata:
     service: ingress
     {{- include "i40-aas.labels" . | nindent 4 }}
   annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    ingress.kubernetes.io/ingress.class: "haproxy"
     {{- if .Values.security.tls.enabled }}
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+    ingress.kubernetes.io/server-ssl: "true"
     {{- end }}
     {{- if .Values.ingress.certManager }}
     cert-manager.io/cluster-issuer: {{ required "A valid .Values.ingress.certManager.clusterIssuer entry required!" .Values.ingress.certManager.clusterIssuer }}
@@ -29,37 +27,27 @@ spec:
     {{- end }}
     http:
       paths:
-      - backend: 
-          serviceName: {{ .Release.Name }}-https-endpoint-ingress
-          servicePort: {{ .Values.core.ingress.http.port }}
-        path: /https-endpoint/(interaction(.*))
       - backend: 
           serviceName: {{ .Release.Name }}-grpc-endpoint-ingress
           servicePort: {{ .Values.core.ingress.grpc.port }}
-        path: /grpc-endpoint/(.*)
-      - backend: 
+      - path: /https-endpoint
+        backend: 
+          serviceName: {{ .Release.Name }}-https-endpoint-ingress
+          servicePort: {{ .Values.core.ingress.http.port }}
+      - path: /adapter-registry
+        backend: 
           serviceName: {{ .Release.Name }}-adapter-registry-api
           servicePort: {{ .Values.core.registries.adapters.port }}
-        path: /adapter-registry/(.*)
-      - backend: 
+      - path: /endpoint-registry
+        backend: 
           serviceName: {{ .Release.Name }}-endpoint-registry
-          servicePort: {{ .Values.core.registries.endpoints.port }}
-        path: /endpoint-registry/(.*)
-      - backend: 
+          servicePort: {{ .Values.core.registries.endpoints.port }}        
+      - path: /data-manager
+        backend: 
+          serviceName: {{ .Release.Name }}-data-manager
+          servicePort: {{ .Values.core.dataManager.port }}       
+      - path: /storage-adapter-mongodb
+        backend: 
           serviceName: {{ .Release.Name }}-storage-adapter-mongodb
           servicePort: {{ .Values.applicationAdapters.mongoDb.port }}
-        path: /storage-adapter-mongodb/(.*)
-{{- /*
-       - backend:
-          serviceName: {{ .Release.Name }}-rabbitmq
-          servicePort: {{ .Values.rabbitmq.service.managerPort }}
-        path: /rabbitmq/(.*) 
-*/ -}}
-{{- /*
-       - backend: 
-          serviceName: {{ .Release.Name }}-onboardingskillmongodb
-          servicePort: {{ .Values.onboardingskillmongodb.service.port }}
-        path: /mongodb/(.*) 
-*/ -}}
-
-
+---

helm/i40-aas/templates/storage-adapter-mongodb.yaml

@@ -6,6 +6,8 @@ metadata:
   labels: 
     service: storage-adapter-mongodb
     {{- include "i40-aas.labels" . | nindent 4 }}
+  annotations:
+    ingress.kubernetes.io/path-rewrite: "/([^/]*)(/?.*) \\2"
 spec:
   ports:
   - targetPort: endpoint