feat(#3): add frontend deployment

eurofurence · Dec 7, 2023 · 9929281 · 9929281
1 parent 4f6222d
commit 9929281
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 1 deletion.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -83,6 +83,14 @@ spec:
                   name: regsys-secret
                   key: {{ . }}
 {{- end }}
+{{- range .envs }}
+            - name: {{ . }}
+              valueFrom:
+                configMapKeyRef:
+                  name: regsys-cm
+                  key: {{ . }}
+{{- end }}
+{{- if ne .volume "no" }}
           volumeMounts:
             - name: config-file
               mountPath: /config
@@ -96,3 +104,4 @@ spec:
                 path: config.yaml
                 mode: 0444
 {{- end }}
+{{- end }}
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -392,3 +392,5 @@ data:
     logging:
       severity: {{ .Values.system.logging.severity }}
       style: {{ .Values.system.logging.style }}
+
+  HTTPD_CONF_PATH_PREFIX_NO_SLASHES: 'TODO'
diff --git a/templates/deployments.yaml b/templates/deployments.yaml
@@ -45,3 +45,12 @@
                          "command" "/usr/bin/java"
                          "args" (list "-jar" "/app/regsys-classic.jar") -}}
 {{- template "helpers.deployment" $classicInput }}
+---
+{{ $frontendInput := dict "name" "frontend"
+                         "all" .Values
+                         "component" .Values.system.components.frontend
+                         "envs" (list "HTTPD_CONF_PATH_PREFIX_NO_SLASHES")
+                         "command" "/usr/sbin/httpd"
+                         "args" (list "-f" "/etc/apache2/regsys.conf")
+                         "volume" "no" -}}
+{{- template "helpers.deployment" $frontendInput }}
diff --git a/tests/configmap_test.yaml b/tests/configmap_test.yaml
@@ -473,6 +473,9 @@ tests:
             logging:
               severity: INFO
               style: ecs
+      - equal:
+          path: data.HTTPD_CONF_PATH_PREFIX_NO_SLASHES
+          value: 'TODO'
 
   - it: should not set namespace if unset
     set:

diff --git a/tests/deployments_test.yaml b/tests/deployments_test.yaml
@@ -7,7 +7,7 @@ tests:
       - isKind:
           of: Deployment
       - hasDocuments:
-          count: 6
+          count: 7
       - equal:
           path: metadata
           value:
@@ -497,6 +497,65 @@ tests:
                           path: config.yaml
                           mode: 0444
         documentIndex: 5
+      - equal:
+          path: metadata
+          value:
+            name: frontend
+            labels:
+              app: regsys
+              service: frontend
+              regsysChart: https://github.com/eurofurence/reg-helm-chart
+        documentIndex: 6
+      - equal:
+          path: spec
+          value:
+            replicas: 1
+            revisionHistoryLimit: 3
+            selector:
+              matchLabels:
+                app: regsys
+                service: frontend
+                regsysChart: https://github.com/eurofurence/reg-helm-chart
+            template:
+              metadata:
+                labels:
+                  app: regsys
+                  service: frontend
+                  regsysChart: https://github.com/eurofurence/reg-helm-chart
+              spec:
+                containers:
+                  - name: application
+                    image: 'ghcr.io/eurofurence/reg-frontend:latest'
+                    ports:
+                      - containerPort: 8080
+                        name: primary
+                    readinessProbe:
+                      httpGet:
+                        port: primary
+                        path: /
+                      initialDelaySeconds: 2
+                      periodSeconds: 10
+                      successThreshold: 1
+                      timeoutSeconds: 1
+                    resources:
+                      limits:
+                        memory: 256Mi
+                    securityContext:
+                      allowPrivilegeEscalation: false
+                      capabilities:
+                        drop:
+                          - ALL
+                    command: [/usr/sbin/httpd]
+                    args:
+                      - -f
+                      - /etc/apache2/regsys.conf
+                    env:
+                      - name: HTTPD_CONF_PATH_PREFIX_NO_SLASHES
+                        valueFrom:
+                          configMapKeyRef:
+                            name: regsys-cm
+                            key: HTTPD_CONF_PATH_PREFIX_NO_SLASHES
+        documentIndex: 6
 
   - it: should not set namespace if unset
     asserts: