adding ingress template for ciso-assistant

Signed-off-by: Sanskar Bhushan <sanskar@obmondo.com>
Obmondo · Jan 14, 2025 · b2db6ed · b2db6ed
1 parent 9344460
commit b2db6ed
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 16 deletions.
diff --git a/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/templates/ingress.yaml b/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/templates/ingress.yaml
@@ -1,24 +1,67 @@
+{{- if .Values.ingress.enabled -}}
+
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-  name: ciso-assistant-{{ .Values.clientName }}
+  name: ciso-assistant
   labels:
     client: {{ .Values.clientName }}
     {{- include "common.labels" . | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .Values.ingress.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
 spec:
-  ingressClassName: nginx
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        - {{ .hosts | join ", " | quote }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-  - host: {{ .Values.clientName }}.{{ .Values.clusterDomain }}
-    http:
-      paths:
-      - backend:
-          service:
-            name: ciso-assistant-{{ .Values.clientName }}
-            port:
-              number: 443
-        path: /
-        pathType: Prefix
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- if $.Values.caddy.enabled }}
+          - backend:
+              service:
+                name: ciso-assistant-{{ $.Values.clientName }}
+                port:
+                  number: 443
+            path: /
+            pathType: Prefix
+          {{- else }}
+          - backend:
+              service:
+                name: ciso-assistant-ciso
+                port:
+                  number: 3000
+            path: /
+            pathType: Prefix
+          - backend:
+              service:
+                name: ciso-assistant-ciso
+                port:
+                  number: 8000
+            path: /api/iam/sso/redirect/
+            pathType: Prefix
+          - backend:
+              service:
+                name: ciso-assistant-ciso
+                port:
+                  number: 8000
+            path: /api/accounts/saml/0/acs/
+            pathType: Prefix
+          - backend:
+              service:
+                name: ciso-assistant-ciso
+                port:
+                  number: 8000
+            path: /api/accounts/saml/0/acs/finish/
+            pathType: Prefix
+          {{- end }}
+    {{- end }}
+{{- end }}
diff --git a/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/templates/service.yaml b/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/templates/service.yaml
@@ -7,6 +7,7 @@ metadata:
     {{- include "common.labels" . | nindent 4 }}
 spec:
   ports:
+  {{- if .Values.caddy.enabled }}
   - name: http
     port: 80
     protocol: TCP
@@ -15,6 +16,16 @@ spec:
     port: 443
     protocol: TCP
     targetPort: 443
+  {{- else }}
+  - name: http-backend
+    port: 8000
+    protocol: TCP
+    targetPort: 8000
+  - name: http-frontend
+    port: 3000
+    protocol: TCP
+    targetPort: 3000
+  {{- end }}
   selector:
     app: ciso-assistant
     client: {{ .Values.clientName }}

diff --git a/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/templates/statefulset.yaml b/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/templates/statefulset.yaml
@@ -107,6 +107,7 @@ spec:
         client: {{ .Values.clientName }}
       name: db-data
     spec:
+      storageClassName: {{ .Values.persistence.storageClass | quote }}
       accessModes:
       - {{ .Values.persistence.accessMode }}
       resources:

diff --git a/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/values.yaml b/argocd-helm-charts/ciso-assistant/charts/ciso-assistant/values.yaml
@@ -42,3 +42,6 @@ image:
 persistence:
   size: 5Gi
   accessMode: ReadWriteOnce
+
+ingress:
+  enabled: false
diff --git a/argocd-helm-charts/ciso-assistant/values.yaml b/argocd-helm-charts/ciso-assistant/values.yaml
@@ -1 +1,9 @@
 ---
+ciso-assistant:
+  clientName: ciso
+  email:
+    debug: true
+  ingress:
+    enabled: true
+  caddy:
+    enabled: false