Merge branch 'main' into rafaeloneill/infra-25-ability-to-configure-i…

…n-house-temporalpostgresql-or-cloud
Multiwoven · May 1, 2024 · 1ecb6a7 · 1ecb6a7
2 parents 8f3985a + 18a720e
commit 1ecb6a7
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 18 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/charts/.DS_Store b/charts/.DS_Store
diff --git a/charts/multiwoven/templates/multiwoven-config.yaml b/charts/multiwoven/templates/multiwoven-config.yaml
@@ -40,3 +40,8 @@ data:
   TEMPORAL_VERSION: {{ .Values.multiwovenConfig.temporalVersion | quote }}
   TEMPORAL_WORKFLOW_THREAD_POOL_SIZE: {{ .Values.multiwovenConfig.temporalWorkflowThreadPoolSize | quote }}
   UI_HOST: {{ .Values.multiwovenConfig.uiHost | quote }}
+  VITE_API_HOST: {{ .Values.multiwovenConfig.viteApiHost | quote }}
+  VITE_BRAND_NAME: {{ .Values.multiwovenConfig.viteBrandName | quote }}
+  VITE_LOGO_URL: {{ .Values.multiwovenConfig.viteLogoUrl | quote }}
+  VITE_BRAND_COLOR: {{ .Values.multiwovenConfig.viteBrandColor | quote }}
+  VITE_BRAND_HOVER_COLOR: {{ .Values.multiwovenConfig.viteBrandHoverColor | quote }}
diff --git a/charts/multiwoven/templates/multiwoven-postgresql-deployment.yaml b/charts/multiwoven/templates/multiwoven-postgresql-deployment.yaml
@@ -50,6 +50,7 @@ spec:
         resources: {{- toYaml .Values.multiwovenPostgresql.multiwovenPostgresql.resources | nindent 10 }}
         volumeMounts:
         - mountPath: /var/lib/postgresql/data
+          subPath: postgres
           name: {{ include "chart.fullname" . }}-postgresql-pvc
       volumes:
       - name: {{ include "chart.fullname" . }}-postgresql-pvc

diff --git a/charts/multiwoven/templates/multiwoven-server-ingress.yaml b/charts/multiwoven/templates/multiwoven-server-ingress.yaml
@@ -8,15 +8,17 @@ metadata:
   {{- include "chart.labels" . | nindent 4 }}
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$1
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
 spec:
   rules:
-  - host:  {{ .Values.multiwovenConfig.apiHost }}
+  - host: {{ .Values.multiwovenConfig.apiHost }}
     http:
       paths:
       - backend:
           service:
             name: '{{ include "chart.fullname" . }}-server'
             port:
               number: 3000
-        path: /
+        path: /(.*)
         pathType: Prefix
diff --git a/charts/multiwoven/templates/multiwoven-ui-deployment.yaml b/charts/multiwoven/templates/multiwoven-ui-deployment.yaml
@@ -0,0 +1,46 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "chart.fullname" . }}-ui
+  namespace: {{ .Values.kubernetesNamespace }}
+  labels:
+    app: {{ include "chart.fullname" . }}-ui
+    io.kompose.service: {{ include "chart.fullname" . }}-ui
+  {{- include "chart.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.multiwovenUI.replicas }}
+  selector:
+    matchLabels:
+      app: {{ include "chart.fullname" . }}-ui
+      io.kompose.service: {{ include "chart.fullname" . }}-ui
+    {{- include "chart.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "chart.fullname" . }}-ui
+        io.kompose.service: {{ include "chart.fullname" . }}-ui
+      {{- include "chart.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+      - env:
+        envFrom:
+        - configMapRef:
+            name: {{ include "chart.fullname" . }}-config
+        image: {{ .Values.multiwovenUI.multiwovenUI.image.repository }}:{{ .Values.multiwovenUI.multiwovenUI.image.tag | default .Chart.AppVersion }}
+        livenessProbe:
+          httpGet:
+            path: /
+            port: 8000
+          initialDelaySeconds: 15
+          periodSeconds: 10
+        name: {{ include "chart.fullname" . }}-ui
+        ports:
+        - containerPort: 8000
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 8000
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        resources: {{- toYaml .Values.multiwovenUI.multiwovenUI.resources | nindent 10 }}
+      restartPolicy: Always
diff --git a/charts/multiwoven/templates/multiwoven-ui-ingress.yaml b/charts/multiwoven/templates/multiwoven-ui-ingress.yaml
@@ -0,0 +1,24 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ include "chart.fullname" . }}-ui-ingress
+  namespace: {{ .Values.kubernetesNamespace }}
+
+  labels:
+  {{- include "chart.labels" . | nindent 4 }}
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    kubernetes.io/ingress.class: nginx
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+spec:
+  rules:
+  - host:  {{ .Values.multiwovenConfig.uiHost }}
+    http:
+      paths:
+      - backend:
+          service:
+            name: '{{ include "chart.fullname" . }}-ui'
+            port:
+              number: 8000
+        path: /(.*)
+        pathType: Prefix
diff --git a/charts/multiwoven/templates/multiwoven-ui-service.yaml b/charts/multiwoven/templates/multiwoven-ui-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "chart.fullname" . }}-ui
+  namespace: {{ .Values.kubernetesNamespace }}
+
+  labels:
+    io.kompose.service:  {{ include "chart.fullname" . }}-ui
+  {{- include "chart.labels" . | nindent 4 }}
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.32.0 (HEAD)
+spec:
+  type: {{ .Values.multiwovenUI.type }}
+  selector:
+    io.kompose.service:  {{ include "chart.fullname" . }}-ui
+  {{- include "chart.selectorLabels" . | nindent 4 }}
+  ports:
+	{{- .Values.multiwovenUI.ports | toYaml | nindent 2 -}}
diff --git a/charts/multiwoven/values.yaml b/charts/multiwoven/values.yaml
@@ -34,6 +34,11 @@ multiwovenConfig:
   temporalVersion: 1.22.4
   temporalWorkflowThreadPoolSize: "10"
   uiHost: app.multiwoven.com
+  viteApiHost: api.multiwoven.com
+  viteBrandName: "Multiwoven"
+  viteLogoUrl: ""
+  viteBrandColor: ""
+  viteBrandHoverColor: ""
 multiwovenPostgresql:
   enabled: true
   multiwovenPostgresql:
@@ -48,9 +53,9 @@ multiwovenPostgresql:
         cpu: 500m
         memory: 1Gi
   ports:
-  - name: postgres
-    port: 5432
-    targetPort: 5432
+    - name: postgres
+      port: 5432
+      targetPort: 5432
   replicas: 1
   type: ClusterIP
 multiwovenServer:
@@ -66,18 +71,36 @@ multiwovenServer:
         cpu: "1"
         memory: 1Gi
   ports:
-  - name: "3000"
-    port: 3000
-    targetPort: 3000
+    - name: "3000"
+      port: 3000
+      targetPort: 3000
+  replicas: 1
+  type: ClusterIP
+multiwovenUI:
+  multiwovenUI:
+    image:
+      repository: multiwoven/multiwoven-ui
+      tag: latest
+    resources:
+      limits:
+        cpu: "2"
+        memory: 2Gi
+      requests:
+        cpu: "1"
+        memory: 1Gi
+  ports:
+    - name: "8000"
+      port: 8000
+      targetPort: 8000
   replicas: 1
   type: ClusterIP
 multiwovenWorker:
   multiwovenWorker:
     args:
-    - sh
-    - -c
-    - |
-      ./app/temporal/cli/register_namespace && ./app/temporal/cli/worker
+      - sh
+      - -c
+      - |
+        ./app/temporal/cli/register_namespace && ./app/temporal/cli/worker
     image:
       repository: multiwoven/multiwoven-server
       tag: latest
@@ -95,9 +118,9 @@ pvc:
 temporal:
   enabled: true
   ports:
-  - name: "7233"
-    port: 7233
-    targetPort: 7233
+    - name: "7233"
+      port: 7233
+      targetPort: 7233
   replicas: 1
   temporal:
     env:
@@ -115,9 +138,9 @@ temporal:
   type: ClusterIP
 temporalUi:
   ports:
-  - name: "8080"
-    port: 8080
-    targetPort: 8080
+    - name: "8080"
+      port: 8080
+      targetPort: 8080
   replicas: 1
   temporalUi:
     env: