Running all stack

opencloud/templates/mongo.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.mongodb.enabled }}
+{{- if index .Values.mongodb.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -7,9 +7,9 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
 spec:
-  accessModes: {{ .Values.mongodb.persistence.accessModes }}
+  accessModes: {{ index .Values.mongodb.persistence.accessModes }}
   resources:
     requests:
-      storage: {{ index .Values.mongodb.persistence.size }}
-  storageClassName: {{ index .Values.mongodb.persistence.storageClass }}
+      storage: {{ .Values.mongodb.persistence.size }}
+  storageClassName: {{ .Values.mongodb.persistence.storageClass }}
 {{- end }}

opencloud/templates/mongoExpress.yaml

@@ -12,7 +12,7 @@ spec:
       priority: 10                    
       services:
       - kind: Service
-        name: {{ .Release.Name }}-mongo-express
+        name: {{ .Release.Name }}-mongo-express.{{ .Release.Namespace }}
         passHostHeader: true
         port: 8081
 {{- end }}

opencloud/templates/nats.yaml

@@ -0,0 +1,13 @@
+{{- if index .Values.nats.enabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nats-config
+data:
+  nats.conf: |
+    port: 4222
+    http_port: 8222
+
+    max_connections: 200000  # optional but recommended
+    max_subscriptions: 200000
+{{- end }}

opencloud/templates/oc-auth/deployment.yaml

@@ -53,8 +53,8 @@ spec:
             memory: "{{ .Values.ocAuth.resources.requests.memory }}"   
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
             periodSeconds: 30     
 {{- end }}

opencloud/templates/oc-catalog/deployment.yaml

@@ -36,4 +36,10 @@ spec:
           requests:
             cpu: "{{ .Values.ocCatalog.resources.requests.cpu }}"
             memory: "{{ .Values.ocCatalog.resources.requests.memory }}"
+        livenessProbe:
+            httpGet:
+              path: /oc/version
+              port: 8080
+            initialDelaySeconds: 10
+            periodSeconds: 30    
 {{- end }}

opencloud/templates/oc-datacenter/deployment.yaml

@@ -31,10 +31,10 @@ spec:
             protocol: TCP
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         resources:
           limits:
             cpu: "{{ .Values.ocDatacenter.resources.limits.cpu }}"

opencloud/templates/oc-front/deployment.yaml

@@ -32,10 +32,10 @@ spec:
             protocol: TCP
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /
+              port: 80
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         resources:
           limits:
             cpu: "{{ .Values.ocFront.resources.limits.cpu }}"

opencloud/templates/oc-peer/deployment.yaml

@@ -27,10 +27,10 @@ spec:
             name: opencloud-config
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         ports:
           - name: http
             containerPort: 8080

opencloud/templates/oc-scheduler/deployment.yaml

@@ -28,10 +28,10 @@ spec:
             name: opencloud-config
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         ports:
           - name: http
             containerPort: 8080

opencloud/templates/oc-schedulerd/deployment.yaml

@@ -25,12 +25,6 @@ spec:
         envFrom:
         - configMapRef:
             name: opencloud-config
-        livenessProbe:
-            httpGet:
-              path: /metrics
-              port: http
-            initialDelaySeconds: 10
-            periodSeconds: 30
         resources:
           limits:
             cpu: "{{ .Values.ocSchedulerd.resources.limits.cpu }}"

opencloud/templates/oc-shared/deployment.yaml

@@ -27,10 +27,10 @@ spec:
             name: opencloud-config
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         ports:
           - name: http
             containerPort: 8080

opencloud/templates/oc-workflow/deployment.yaml

@@ -31,10 +31,10 @@ spec:
             protocol: TCP
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         resources:
           limits:
             cpu: "{{ .Values.ocWorkflow.resources.limits.cpu }}"

opencloud/templates/oc-workspace/deployment.yaml

@@ -27,10 +27,10 @@ spec:
             protocol: TCP
         livenessProbe:
             httpGet:
-              path: /metrics
-              port: http
+              path: /oc/version
+              port: 8080
             initialDelaySeconds: 10
-            periodSeconds: 30
+            periodSeconds: 30   
         resources:
           limits:
             cpu: "{{ .Values.ocWorkspace.resources.limits.cpu }}"

opencloud/templates/openCloudConf.yaml

@@ -24,7 +24,6 @@ data:
   OC_LDAP_ROLE_BASEDN: "{{ index .Values.ocAuth.ldap.roleBaseDn }}"
   OC_MONGO_URL: "mongodb://{{ index .Values.mongodb.auth.rootUser }}:{{ index .Values.mongodb.auth.rootPassword }}@{{ .Release.Name }}-mongodb.{{ .Release.Namespace }}:27017/{{ index .Values.mongodb.auth.databases 0 }}"
   OC_MONGO_DATABASE: "{{ index .Values.mongodb.auth.databases 0 }}"
-  OC_NATS_URL: "nats://{{ .Release.Name }}-nats.{{ .Release.Namespace }}:4222"
-  OC_LOKI_URL: "http://{{ .Release.Name }}-loki.{{ .Release.Namespace }}:3100"
-  OC_LOKI_URL: "http://{{ .Release.Name }}-loki.{{ .Release.Namespace }}:3100"
+  OC_NATS_URL: "nats://{{ .Release.Name }}-nats.{{ .Release.Namespace }}.svc.cluster.local:4222"
+  OC_LOKI_URL: "http://loki-headless.{{ .Release.Namespace }}.svc.cluster.local:3100"
   OC_PROMETHEUS_URL: "http://{{ .Release.Name }}-monitor.{{ .Release.Namespace }}:9090"

opencloud/templates/openldap.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.externalLDAP.enabled }}
+{{- if .Values.openldap.externalLDAP.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

opencloud/templates/prometheus.yaml

@@ -1,15 +1,18 @@
-{{- if .Values.prometheus.enabled }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
+{{- if index .Values "prometheus" "enabled" }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
 metadata:
-  name: {{ .Release.Name }}-monitor.{{ .Release.Namespace }}
-  labels:
-    release: {{ .Release.Name }}
+  name: prometheus-ingress
 spec:
-  selector:
-    matchLabels:
-      app: monitor
-  endpoints:
-    - port: http
-      interval: 30s
+  entryPoints:
+    - web
+  routes:                           
+    - kind: Rule
+      match:  Host(`{{ .Values.host }}`) &&  PathPrefix(`/monitor`)
+      priority: 10                    
+      services:
+      - kind: Service
+        name: {{ .Release.Name }}-monitor.{{ .Release.Namespace }}
+        passHostHeader: true
+        port: 9090
 {{- end }}

opencloud/templates/sc-longhorn-nor1.yaml

@@ -0,0 +1,10 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: longhorn-nor1
+provisioner: driver.longhorn.io
+parameters:
+  numberOfReplicas: "2"        # set 1 for single-node testing
+reclaimPolicy: Retain
+allowVolumeExpansion: true
+volumeBindingMode: Immediate