Adjustments

2025-03-27 13:04:29 +01:00
parent 1ef92e5975
commit 4ef9bb399f
30 changed files with 68 additions and 299 deletions
--- a/opencloud/dev-values.yaml
+++ b/opencloud/dev-values.yaml
@@ -243,7 +243,6 @@ keto:
          name: open-cloud
      dsn: memory

-
 loki:
  enabled: true
  loki:
@@ -470,17 +469,6 @@ ocSchedulerd:
      cpu: "128m"
      memory: "256Mi"

-ocDiscovery:
-  enabled: true
-  image: oc/oc-discovery:0.0.1
-  resources:
-    limits:
-      cpu: "128m"
-      memory: "256Mi"
-    requests:
-      cpu: "128m"
-      memory: "256Mi"
-
 ocScheduler:
  enabled: true
  image: oc/oc-scheduler:0.0.1
@@ -492,17 +480,6 @@ ocScheduler:
      cpu: "128m"
      memory: "256Mi"

-ocAggregator:
-  enabled: true
-  image: oc/oc-aggregator:0.0.1
-  resources:
-    limits:
-      cpu: "128m"
-      memory: "256Mi"
-    requests:
-      cpu: "128m"
-      memory: "256Mi"
-
 docker-registry-ui:
  enabled: true
  ui:
--- a/opencloud/prod-values.yaml
+++ b/opencloud/prod-values.yaml
@@ -469,17 +469,6 @@ ocSchedulerd:
      cpu: "128m"
      memory: "256Mi"

-ocDiscovery:
-  enabled: true
-  image: "registry-opencloud.pf.irt-saintexupery.com/oc-discovery:0.0.1"
-  resources:
-    limits:
-      cpu: "128m"
-      memory: "256Mi"
-    requests:
-      cpu: "128m"
-      memory: "256Mi"
-
 ocScheduler:
  enabled: true
  image: "registry-opencloud.pf.irt-saintexupery.com/oc-scheduler:0.0.1"
@@ -491,17 +480,6 @@ ocScheduler:
      cpu: "128m"
      memory: "256Mi"

-ocAggregator:
-  enabled: true
-  image: "registry-opencloud.pf.irt-saintexupery.com/oc-aggregator:0.0.1"
-  resources:
-    limits:
-      cpu: "128m"
-      memory: "256Mi"
-    requests:
-      cpu: "128m"
-      memory: "256Mi"
-
 docker-registry-ui:
  enabled: true
  ui:
--- a/opencloud/templates/oc-aggregator/deployment.yaml
+++ b/opencloud/templates/oc-aggregator/deployment.yaml
@@ -1,39 +0,0 @@
-{{- if index .Values.ocAggregator.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: oc-aggregator
-  name: {{ .Release.Name }}-oc-aggregator
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: oc-aggregator
-  template:
-    metadata:
-      labels:
-        app: oc-aggregator
-    spec:
-      {{- if or (eq .Values.env "prod") (eq .Values.env "staging") }}
-      imagePullSecrets:
-        - name: regcred
-      {{- end }}
-      containers:
-      - image: "{{ .Values.ocAggregator.image }}"
-        name: oc-aggregator
-        envFrom:
-        - configMapRef:
-            name: opencloud-config
-        ports:
-          - name: http
-            containerPort: 8080
-            protocol: TCP
-        resources:
-          limits:
-            cpu: "{{ .Values.ocAggregator.resources.limits.cpu }}"
-            memory: "{{ .Values.ocAggregator.resources.limits.memory }}"
-          requests:
-            cpu: "{{ .Values.ocAggregator.resources.requests.cpu }}"
-            memory: "{{ .Values.ocAggregator.resources.requests.memory }}"
-  {{- end }}
--- a/opencloud/templates/oc-aggregator/ingress.yaml
+++ b/opencloud/templates/oc-aggregator/ingress.yaml
@@ -1,32 +0,0 @@
-{{- if index .Values.ocAggregator.enabled }}
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: oc-aggregator-ingress
-spec:
-  entryPoints:
-    - web
-  routes:                           
-    - kind: Rule
-      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/aggregator`)
-      priority: 10                    
-      services:
-      - kind: Service
-        name: oc-aggregator-svc
-        port: 8080
-      middlewares:
-      - name: strip-aggregator-prefix
-      {{- if index .Values.ocAuth.enableTraefikProxyIntegration }}
-      - name: forward-auth
-      {{- end }}
-
---
-apiVersion:  traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: strip-aggregator-prefix
-spec:
-  stripPrefix:
-    prefixes:
-      - "/aggregator"
-{{- end }}
--- a/opencloud/templates/oc-aggregator/service.yaml
+++ b/opencloud/templates/oc-aggregator/service.yaml
@@ -1,17 +0,0 @@
-{{- if index .Values.ocAggregator.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: oc-aggregator-svc
-  labels:
-    app: oc-aggregator-svc
-spec:
-  ports:
-  - name: http
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: oc-aggregator
-  type: ClusterIP
-{{- end }}
--- a/opencloud/templates/oc-auth/deployment.yaml
+++ b/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 }}
--- a/opencloud/templates/oc-auth/ingress.yaml
+++ b/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 }}      
--- a/opencloud/templates/oc-auth/service.yaml
+++ b/opencloud/templates/oc-auth/service.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
  ports:
  - name: http
-    port: 8094
+    port: 8080
    protocol: TCP
    targetPort: 8080
  selector:
--- a/opencloud/templates/oc-catalog/ingress.yaml
+++ b/opencloud/templates/oc-catalog/ingress.yaml
@@ -26,7 +26,7 @@ kind: Middleware
 metadata:
  name: strip-catalog-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/catalog"
+  replacePathRegex:
+    regex: ^/catalog(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/oc-datacenter/ingress.yaml
+++ b/opencloud/templates/oc-datacenter/ingress.yaml
@@ -16,7 +16,9 @@ spec:
        port: 8080
      middlewares:
      - name: strip-datacenter-prefix
-      - name:  forward-auth
+      {{- if index .Values.ocAuth.enableTraefikProxyIntegration }}
+      - name: forward-auth
+      {{- end }}

 ---
 apiVersion:  traefik.io/v1alpha1
@@ -24,7 +26,7 @@ kind: Middleware
 metadata:
  name: strip-datacenter-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/datacenter"
+  replacePathRegex:
+    regex: ^/datacenter(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/oc-discovery/deployment.yaml
+++ b/opencloud/templates/oc-discovery/deployment.yaml
@@ -1,39 +0,0 @@
-{{- if index .Values.ocDiscovery.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: oc-discovery
-  name: {{ .Release.Name }}-oc-discovery
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: oc-discovery
-  template:
-    metadata:
-      labels:
-        app: oc-discovery
-    spec:
-      {{- if or (eq .Values.env "prod") (eq .Values.env "staging") }}
-      imagePullSecrets:
-        - name: regcred
-      {{- end }}
-      containers:
-      - image: "{{ .Values.ocDiscovery.image }}"
-        name: oc-discovery
-        envFrom:
-        - configMapRef:
-            name: opencloud-config
-        ports:
-          - name: http
-            containerPort: 8080
-            protocol: TCP
-        resources:
-          limits:
-            cpu: "{{ .Values.ocDiscovery.resources.limits.cpu }}"
-            memory: "{{ .Values.ocDiscovery.resources.limits.memory }}"
-          requests:
-            cpu: "{{ .Values.ocDiscovery.resources.requests.cpu }}"
-            memory: "{{ .Values.ocDiscovery.resources.requests.memory }}"
-  {{- end }}
--- a/opencloud/templates/oc-discovery/ingress.yaml
+++ b/opencloud/templates/oc-discovery/ingress.yaml
@@ -1,29 +0,0 @@
-{{- if index .Values.ocDiscovery.enabled }}
-apiVersion: traefik.io/v1alpha1
-kind: IngressRoute
-metadata:
-  name: oc-discovery-ingress
-spec:
-  entryPoints:
-    - web
-  routes:                           
-    - kind: Rule
-      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/discovery`)
-      priority: 10                    
-      services:
-      - kind: Service
-        name: oc-discovery-svc
-        port: 8080
-      middlewares:
-      - name: strip-discovery-prefix
-
---
-apiVersion:  traefik.io/v1alpha1
-kind: Middleware
-metadata:
-  name: strip-discovery-prefix
-spec:
-  stripPrefix:
-    prefixes:
-      - "/discovery"
-{{- end }}
--- a/opencloud/templates/oc-discovery/service.yaml
+++ b/opencloud/templates/oc-discovery/service.yaml
@@ -1,17 +0,0 @@
-{{- if index .Values.ocDiscovery.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: oc-discovery-svc
-  labels:
-    app: oc-discovery-svc
-spec:
-  ports:
-  - name: http
-    port: 8080
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: oc-discovery
-  type: ClusterIP
-{{- end }}
--- a/opencloud/templates/oc-front/config.yaml
+++ b/opencloud/templates/oc-front/config.yaml
@@ -6,15 +6,14 @@ metadata:
 data:
  config.json: |
    {
-      "WORKSPACE_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/workspace/oc",
-      "WORKFLOW_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/workflow/oc",
-      "ITEM_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/catalog/oc",
-      "SCHEDULER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/scheduler/oc",
-      "LOGS_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/logs",
-      "PEER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/peers/oc",
-      "DATACENTER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/datacenter/oc",
-      "COLLABORATIVE_AREA_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/shared/oc",
-      "HOST": "{{ .Values.scheme }}://{{ .Values.host }}/oc",
-      "AUTH_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/auth/oc"
+      "WORKSPACE_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/workspace",
+      "WORKFLOW_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/workflow",
+      "CATALOG_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/catalog",
+      "SCHEDULER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/scheduler",
+      "PEER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/peers",
+      "DATACENTER_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/datacenter",
+      "COLLABORATIVE_AREA_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/shared",
+      "HOST": "{{ .Values.scheme }}://{{ .Values.host }}",
+      "AUTH_HOST": "{{ .Values.scheme }}://{{ .Values.host }}/auth"
    }
 {{- end }}
--- a/opencloud/templates/oc-peer/ingress.yaml
+++ b/opencloud/templates/oc-peer/ingress.yaml
@@ -8,7 +8,7 @@ spec:
    - web
  routes:                           
    - kind: Rule
-      match:   Host(`{{ .Values.host }}`) && PathPrefix(`/peers`)
+      match: Host(`{{ .Values.host }}`) && PathPrefix(`/peer`)
      priority: 10                    
      services:
      - kind: Service
@@ -27,7 +27,7 @@ kind: Middleware
 metadata:
  name: strip-peer-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/peers"
+  replacePathRegex:
+    regex: ^/peer(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/oc-scheduler/ingress.yaml
+++ b/opencloud/templates/oc-scheduler/ingress.yaml
@@ -27,7 +27,7 @@ kind: Middleware
 metadata:
  name: strip-scheduler-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/scheduler"
+  replacePathRegex:
+    regex: ^/scheduler(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/oc-shared/ingress.yaml
+++ b/opencloud/templates/oc-shared/ingress.yaml
@@ -26,7 +26,7 @@ kind: Middleware
 metadata:
  name: strip-shared-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/shared"
+  replacePathRegex:
+    regex: ^/shared(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/oc-workflow/ingress.yaml
+++ b/opencloud/templates/oc-workflow/ingress.yaml
@@ -27,7 +27,7 @@ kind: Middleware
 metadata:
  name: strip-workflow-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/workflow"
+  replacePathRegex:
+    regex: ^/workflow(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/oc-workspace/ingress.yaml
+++ b/opencloud/templates/oc-workspace/ingress.yaml
@@ -26,7 +26,7 @@ kind: Middleware
 metadata:
  name: strip-workspace-prefix
 spec:
-  stripPrefix:
-    prefixes:
-      - "/workspace"
+  replacePathRegex:
+    regex: ^/workspace(.*)
+    replacement: /oc$1
 {{- end }}
--- a/opencloud/templates/traefik.yaml
+++ b/opencloud/templates/traefik.yaml
@@ -4,5 +4,5 @@ metadata:
  name: forward-auth
 spec:
  forwardAuth:
-    address: "http://oc-auth-svc.{{ .Release.Namespace }}:8094/oc/forward"
+    address: "http://oc-auth-svc.{{ .Release.Namespace }}:8080/oc/forward"
    trustForwardHeader: true