Add Volume

cmd/opencloud-chart/templates/hydra.yaml

@@ -9,10 +9,9 @@ spec:
   routes:                           
     - kind: Rule
       match:  Host(`{{ .Values.host }}`) &&  PathPrefix(`/hydra`)
-      priority: 10                    
       services:
       - kind: Service
-        name: {{ .Release.Name }}-hydra-public.{{ .Release.Namespace }}
+        name: {{ .Release.Name }}-hydra-public
         passHostHeader: true
         port: 4444
 ---

cmd/opencloud-chart/templates/ldapUserManager.yaml

@@ -104,7 +104,6 @@ spec:
   routes:                           
     - kind: Rule
       match:  Host(`{{ .Values.host }}`) &&  PathPrefix(`/users`)
-      priority: 10                    
       services:
       - kind: Service
         name: {{ .Release.Name }}-ldap-user-manager-svc

cmd/opencloud-chart/templates/mongo.yaml

@@ -11,5 +11,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.mongodb.persistence.size }}
-  storageClassName: {{ .Values.mongodb.persistence.storageClass }}
+  storageClassName: {{ .Values.mongodb.global.storageClass }}
 {{- end }}

cmd/opencloud-chart/templates/mongoExpress.yaml

@@ -9,10 +9,9 @@ spec:
   routes:                           
     - kind: Rule
       match:  Host(`{{ .Values.host }}`) &&  PathPrefix(`/mongoexpress`)
-      priority: 10                    
       services:
       - kind: Service
-        name: {{ .Release.Name }}-mongo-express.{{ .Release.Namespace }}
+        name: {{ .Release.Name }}-mongo-express
         passHostHeader: true
         port: 8081
 {{- end }}

cmd/opencloud-chart/templates/oc-front/config.yaml

@@ -0,0 +1,18 @@
+{{- if index .Values.ocFront.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: front-config
+data:
+  config.json: |
+    {
+      "WORKSPACE_HOST": "workspace",
+      "WORKFLOW_HOST": "workflow",
+      "CATALOG_HOST": "catalog",
+      "SCHEDULER_HOST": "scheduler",
+      "PEER_HOST": "peers",
+      "DATACENTER_HOST": "datacenter",
+      "COLLABORATIVE_AREA_HOST": "shared",
+      "HOST": "{{ .Values.scheme }}://{{ .Values.host }}",
+    }
+{{- end }}

cmd/opencloud-chart/templates/oc-front/deployment.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.ocFront.enabled }}
+{{- if index .Values.ocFront.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -6,7 +6,7 @@ metadata:
     app: oc-front
   name: {{ .Release.Name }}-oc-front
 spec:
-  replicas: {{ .Values.ocFront.replicas }}
+  replicas: 1
   selector:
     matchLabels:
       app: oc-front
@@ -30,12 +30,6 @@ spec:
           - name: http
             containerPort: 80
             protocol: TCP
-        livenessProbe:
-            httpGet:
-              path: /
-              port: 80
-            initialDelaySeconds: 10
-            periodSeconds: 30   
         resources:
           limits:
             cpu: "{{ .Values.ocFront.resources.limits.cpu }}"

cmd/opencloud-chart/templates/prometheus.yaml

@@ -9,10 +9,9 @@ spec:
   routes:                           
     - kind: Rule
       match:  Host(`{{ .Values.host }}`) &&  PathPrefix(`/monitor`)
-      priority: 10                    
       services:
       - kind: Service
-        name: {{ .Release.Name }}-monitor.{{ .Release.Namespace }}
+        name: {{ .Release.Name }}-prometheus-server
         passHostHeader: true
-        port: 9090
+        port: 80
 {{- end }}

cmd/opencloud-chart/templates/registry/docker-registry.yaml

@@ -25,7 +25,6 @@ spec:
   routes:
   - kind: Rule
     match: Host(`{{ .Values.registryHost }}`)
-    priority: 5
     services:
     - kind: Service
       name:  {{ .Values.env }}-docker-registry-ui-registry-server
@@ -43,7 +42,6 @@ spec:
   routes:
   - kind: Rule
     match: Host(`{{ .Values.registryHost }}`) && PathPrefix(`/ui`)
-    priority: 10
     services:
     - kind: Service
       name:  {{ .Values.env }}-docker-registry-ui-user-interface

cmd/opencloud-chart/templates/traefik/traefik.yaml

@@ -1,3 +1,4 @@
+{{- if index .Values.traefik.enabled }}
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
@@ -6,3 +7,4 @@ spec:
   forwardAuth:
     address: "http://oc-auth-svc.{{ .Release.Namespace }}:8080/oc/forward"
     trustForwardHeader: true
+{{- end }}