Adjustments

opencloud/templates/oc-auth/deployment.yaml

@@ -10,7 +10,6 @@ spec:
   selector:
     matchLabels:
       app: oc-auth
-  strategy: {}
   template:
     metadata:
       labels:
@@ -47,9 +46,9 @@ spec:
             protocol: TCP
         resources:
           limits:
-            cpu: "{{ .Values.ocFront.resources.limits.cpu }}"
-            memory: "{{ .Values.ocFront.resources.limits.memory }}"
+            cpu: "{{ .Values.ocAuth.resources.limits.cpu }}"
+            memory: "{{ .Values.ocAuth.resources.limits.memory }}"
           requests:
-            cpu: "{{ .Values.ocFront.resources.requests.cpu }}"
-            memory: "{{ .Values.ocFront.resources.requests.memory }}"        
+            cpu: "{{ .Values.ocAuth.resources.requests.cpu }}"
+            memory: "{{ .Values.ocAuth.resources.requests.memory }}"        
 {{- end }}

opencloud/templates/oc-auth/ingress.yaml

@@ -8,16 +8,16 @@ spec:
     - web
   routes:                           
     - kind: Rule
-      match:  Host(`{{ .Values.host }}`) &&  PathPrefix(`/auth`)
+      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/auth`)
       priority: 10                    
       services:
       - kind: Service
         name: oc-auth-svc
-        port: 8094
+        port: 8080
       middlewares:
-      {{- if index .Values.ocAuth.enableTraefikProxyIntegration }}
-      - name: forward-auth
-      {{- end }}
+      #{{- if index .Values.ocAuth.enableTraefikProxyIntegration }}
+      #- name: forward-auth
+      #{{- end }}
       - name: strip-auth-prefix
 ---
 apiVersion:  traefik.io/v1alpha1
@@ -25,7 +25,7 @@ kind: Middleware
 metadata:
   name: strip-auth-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/auth"
+  replacePathRegex:
+    regex: ^/auth(.*)
+    replacement: /oc$1
 {{- end }}      

opencloud/templates/oc-auth/service.yaml

@@ -8,7 +8,7 @@ metadata:
 spec:
   ports:
   - name: http
-    port: 8094
+    port: 8080
     protocol: TCP
     targetPort: 8080
   selector: