From 86af4472adaac6625d62507bcb83caf15943d5b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 21 Nov 2022 12:31:11 +0100
Subject: [PATCH] FMN: fix ports and rename config file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 roles/openshift-apps/fmn/files/service.yml    |  4 ++--
 .../fmn/templates/configmap.yml               |  4 ++--
 .../fmn/templates/deploymentconfig.yml        | 19 ++++++++++++++++---
 .../{sender.toml => sender-email.toml}        |  0
 4 files changed, 20 insertions(+), 7 deletions(-)
 rename roles/openshift-apps/fmn/templates/{sender.toml => sender-email.toml} (100%)

diff --git a/roles/openshift-apps/fmn/files/service.yml b/roles/openshift-apps/fmn/files/service.yml
index 5270eda15a..92e0d35a76 100644
--- a/roles/openshift-apps/fmn/files/service.yml
+++ b/roles/openshift-apps/fmn/files/service.yml
@@ -23,8 +23,8 @@ metadata:
 spec:
   ports:
     - name: web
-      port: 8081
-      targetPort: 8081
+      port: 8080
+      targetPort: 8080
   selector:
     app: fmn
     deploymentconfig: api
diff --git a/roles/openshift-apps/fmn/templates/configmap.yml b/roles/openshift-apps/fmn/templates/configmap.yml
index fe26120d6c..76a7b972c9 100644
--- a/roles/openshift-apps/fmn/templates/configmap.yml
+++ b/roles/openshift-apps/fmn/templates/configmap.yml
@@ -15,5 +15,5 @@ items:
       {{ load_file('fmn.cfg') | indent(6) }}
     consumer.toml: |-
       {{ load_file('consumer.toml') | indent(6) }}
-    sender.toml: |-
-      {{ load_file('sender.toml') | indent(6) }}
+    sender-email.toml: |-
+      {{ load_file('sender-email.toml') | indent(6) }}
diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index 5951de5de4..b8bfca3fcd 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -39,13 +39,13 @@ spec:
               value: ".s2i/run-frontend.sh"
           readinessProbe:
             timeoutSeconds: 1
-            initialDelaySeconds: 10
+            initialDelaySeconds: 5
             httpGet:
               path: /
               port: 8080
           livenessProbe:
             timeoutSeconds: 1
-            initialDelaySeconds: 5
+            initialDelaySeconds: 20
             httpGet:
               path: /
               port: 8080
@@ -94,7 +94,7 @@ spec:
         - name: api
           imagePullPolicy: Always
           ports:
-            - containerPort: 8081
+            - containerPort: 8080
           volumeMounts:
             - name: etc-fmn
               mountPath: "/etc/fmn"
@@ -125,6 +125,19 @@ spec:
             - name: KRB5_CLIENT_KTNAME
               value: /etc/keytabs/service.keytab
 
+          readinessProbe:
+            timeoutSeconds: 1
+            initialDelaySeconds: 5
+            httpGet:
+              path: /
+              port: 8080
+          livenessProbe:
+            timeoutSeconds: 1
+            initialDelaySeconds: 20
+            httpGet:
+              path: /
+              port: 8080
+
       volumes:
         - name: etc-fmn
           configMap:
diff --git a/roles/openshift-apps/fmn/templates/sender.toml b/roles/openshift-apps/fmn/templates/sender-email.toml
similarity index 100%
rename from roles/openshift-apps/fmn/templates/sender.toml
rename to roles/openshift-apps/fmn/templates/sender-email.toml