From 719a58388e5342aac8b53152bb0c766e4183eb75 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: Nov 23 2022 14:55:46 +0000
Subject: FMN: add redis for caching


Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/roles/openshift-apps/fmn/files/imagestream.yml b/roles/openshift-apps/fmn/files/imagestream.yml
index 34510f0..abb601a 100644
--- a/roles/openshift-apps/fmn/files/imagestream.yml
+++ b/roles/openshift-apps/fmn/files/imagestream.yml
@@ -33,3 +33,13 @@ items:
     #       from:
     #         kind: DockerImage
     #         name: msztolcman/sendria:v2.2.2.0
+  - apiVersion: v1
+    kind: ImageStream
+    metadata:
+      name: redis
+    spec:
+      tags:
+        - name: latest
+          from:
+            kind: DockerImage
+            name: docker.io/bitnami/redis:latest
diff --git a/roles/openshift-apps/fmn/files/service.yml b/roles/openshift-apps/fmn/files/service.yml
index c1a181c..cfa76c8 100644
--- a/roles/openshift-apps/fmn/files/service.yml
+++ b/roles/openshift-apps/fmn/files/service.yml
@@ -46,3 +46,19 @@ spec:
   selector:
     app: fmn
     deploymentconfig: sendria
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  labels:
+    app: fmn
+spec:
+  ports:
+    - name: redis
+      port: 6379
+      protocol: TCP
+      targetPort: 6379
+  selector:
+    app: fmn
+    deploymentconfig: redis
diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index b40411b..8339db9 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -53,6 +53,7 @@ spec:
         - name: httpdir-volume
           emptyDir: {}
   triggers:
+    - type: ConfigChange
     - type: ImageChange
       imageChangeParams:
         automatic: true
@@ -61,7 +62,6 @@ spec:
         from:
           kind: ImageStreamTag
           name: fmn:latest
-    - type: ConfigChange
 ---
 apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
@@ -127,6 +127,11 @@ spec:
               value: /etc/ipa/krb5.conf
             - name: KRB5_CLIENT_KTNAME
               value: /etc/keytabs/service.keytab
+            - name: CACHE_ARGUMENTS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: fmn
+                  key: redis-password
 
           readinessProbe:
             timeoutSeconds: 1
@@ -161,6 +166,7 @@ spec:
           secret:
             secretName: fedora-messaging-crt
   triggers:
+    - type: ConfigChange
     - type: ImageChange
       imageChangeParams:
         automatic: true
@@ -169,7 +175,6 @@ spec:
         from:
           kind: ImageStreamTag
           name: fmn:latest
-    - type: ConfigChange
 ---
 apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
@@ -229,6 +234,11 @@ spec:
               value: /etc/ipa/krb5.conf
             - name: KRB5_CLIENT_KTNAME
               value: /etc/keytabs/service.keytab
+            - name: CACHE_ARGUMENTS_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: fmn
+                  key: redis-password
       volumes:
         - name: etc-fmn
           configMap:
@@ -249,6 +259,7 @@ spec:
           secret:
             secretName: fedora-messaging-crt
   triggers:
+    - type: ConfigChange
     - type: ImageChange
       imageChangeParams:
         automatic: true
@@ -257,7 +268,6 @@ spec:
         from:
           kind: ImageStreamTag
           name: fmn:latest
-    - type: ConfigChange
 ---
 apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
@@ -313,6 +323,7 @@ spec:
           secret:
             secretName: fedora-messaging-crt
   triggers:
+    - type: ConfigChange
     - type: ImageChange
       imageChangeParams:
         automatic: true
@@ -321,7 +332,44 @@ spec:
         from:
           kind: ImageStreamTag
           name: fmn:latest
-    - type: ConfigChange
+---
+- apiVersion: apps.openshift.io/v1
+  kind: DeploymentConfig
+  metadata:
+    name: redis
+    labels:
+      app: fmn
+      service: redis
+  spec:
+    replicas: 1
+    selector:
+      app: fmn
+      deploymentconfig: redis
+    template:
+      metadata:
+        labels:
+          app: fmn
+          deploymentconfig: redis
+      spec:
+        containers:
+          - name: redis
+            image: redis:latest
+            env:
+              - name: REDIS_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: fmn
+                    key: redis-password
+    triggers:
+      - type: ConfigChange
+      - type: ImageChange
+        imageChangeParams:
+          automatic: true
+          containerNames:
+            - redis
+          from:
+            kind: ImageStreamTag
+            name: redis:latest
 ---
 apiVersion: v1
 kind: DeploymentConfig
diff --git a/roles/openshift-apps/fmn/templates/fmn.cfg b/roles/openshift-apps/fmn/templates/fmn.cfg
index 3c47afa..ddf3c6f 100644
--- a/roles/openshift-apps/fmn/templates/fmn.cfg
+++ b/roles/openshift-apps/fmn/templates/fmn.cfg
@@ -7,3 +7,5 @@ OIDC_CLIENT_ID="fmn"
 # OIDC_CLIENT_SECRET is set in the environement by the deploymentconfig
 SERVICES__FASJSON_URL=https://fasjson{{ env_suffix }}.fedoraproject.org
 SERVICES__DISTGIT_URL=https://src{{ env_suffix }}.fedoraproject.org
+CACHE__BACKEND="dogpile.cache.redis"
+CACHE__ARGUMENTS__HOST="redis.fmn.svc.cluster.local"