Merge pull request #3 from InformaticsMatters/motd

Add motd variable and content in ConfigMap

Author: achristie-im

.yamllint

@@ -9,7 +9,7 @@ ignore: |
   .github/
   roles/mini-apps-ui/templates/configmap.yaml.j2
   roles/mini-apps-ui/templates/serviceaccount.yaml.j2
-  roles/mini-apps-ui/templates/statefulset.yaml.j2
+  roles/mini-apps-ui/templates/deployment.yaml.j2
 
 rules:
   indentation:

roles/mini-apps-ui/defaults/main.yaml

@@ -10,6 +10,11 @@ maui_state: present
 # The namespace to create for application deployment.
 maui_namespace: data-manager-ui
 
+# Message of the day (YAML) - a list (possibly empty).
+# This gets injected into the UI Pod as the 'motd.yaml' file.
+maui_motd: |
+  motd: []
+
 # Realm
 maui_keycloak_realm: squonk
 maui_keycloak_client_id: data-manager-ui

roles/mini-apps-ui/tasks/deploy.yaml

@@ -44,6 +44,6 @@
     wait_timeout: "{{ pod_ready_timeout }}"
   loop:
   - configmap.yaml.j2
-  - statefulset.yaml.j2
+  - deployment.yaml.j2
   - service.yaml.j2
   - ingress.yaml.j2

roles/mini-apps-ui/templates/configmap.yaml.j2

@@ -23,3 +23,5 @@ data:
 {% if maui_disable_ssl_cert_check %}
     DANGEROUS__DISABLE_SSL_CERT_CHECK_IN_API_PROXY='1'
 {% endif %}
+
+  motd.yaml: {{ maui_motd | to_yaml }}

…ni-apps-ui/templates/statefulset.yaml.j2 …ini-apps-ui/templates/deployment.yaml.j2roles/mini-apps-ui/templates/statefulset.yaml.j2 renamed to roles/mini-apps-ui/templates/deployment.yaml.j2 roles/mini-apps-ui/templates/statefulset.yaml.j2 renamed to roles/mini-apps-ui/templates/deployment.yaml.j2

@@ -1,16 +1,19 @@
 ---
-kind: StatefulSet
+kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: mini-apps-ui
   namespace: {{ maui_namespace }}
 spec:
-  revisionHistoryLimit: 10
+  replicas: 1
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 0
   selector:
     matchLabels:
       name: mini-apps-ui
-  serviceName: mini-apps-ui
-  replicas: {{ maui_replicas }}
   template:
     metadata:
       name: mini-apps-ui
@@ -22,24 +25,6 @@ spec:
 {% endif %}
       serviceAccountName: mini-apps-ui
 
-      # Try to avoid 'worker' nodes (lower weight),
-      # instead preferring 'application' nodes (higher weight)
-      # falling back on anything else (like 'core') if there's still not room.
-      affinity:
-        nodeAffinity:
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 1
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: informaticsmatters.com/purpose-worker
-                operator: Exists
-          preferredDuringSchedulingIgnoredDuringExecution:
-          - weight: 10
-            preference:
-              matchExpressions:
-              - key: {{ maui_fallback_node_selector_key }}
-                operator: Exists
-
       containers:
       - name: mini-apps-ui
         image: {{ maui_image_name }}:{{ maui_image_tag }}
@@ -57,6 +42,10 @@ spec:
           name: config-ui
           subPath: .env.production
           readOnly: true
+        - mountPath: /app/motd.yaml
+          name: config-ui
+          subPath: motd.yaml
+          readOnly: true
         env:
         # CICD_TRIGGER_ID is variable whose value is used to force
         # a redeployment of the underlying containers. This is used in
@@ -66,22 +55,6 @@ spec:
         # a roll-out will not occur if the tag has not changed.
         - name: CICD_TRIGGER_ID
           value: '{{ ansible_date_time.iso8601_micro }}'
-#        readinessProbe:
-#          tcpSocket:
-#            port: 3000
-#          initialDelaySeconds: 5
-#          timeoutSeconds: 3
-#          periodSeconds: 10
-#          successThreshold: 1
-#          failureThreshold: 6
-#        livenessProbe:
-#          tcpSocket:
-#            port: 3000
-#          initialDelaySeconds: 5
-#          timeoutSeconds: 3
-#          periodSeconds: 10
-#          successThreshold: 1
-#          failureThreshold: 6
         resources:
           requests:
             cpu: {{ maui_cpu_request }}