From 6871f63bdf5e2bfad1087ec6f4fc39d34ce787c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 21 Nov 2022 12:21:24 +0100
Subject: [PATCH] Register FMN with IPA
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 playbooks/openshift-apps/fmn.yml                 |  5 ++++-
 .../fmn/templates/deploymentconfig.yml           | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml
index 6527d705eb..f1b7780366 100644
--- a/playbooks/openshift-apps/fmn.yml
+++ b/playbooks/openshift-apps/fmn.yml
@@ -201,7 +201,10 @@
       template: deploymentconfig.yml
       objectname: deploymentconfig.yml
 
-    # Keytab for FASJSON access
+    # FASJSON access
+    - role: openshift/ipa-client
+      app: fmn
+
     - role: openshift/keytab
       app: fmn
       key: service.keytab
diff --git a/roles/openshift-apps/fmn/templates/deploymentconfig.yml b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
index 26dc407e7f..5951de5de4 100644
--- a/roles/openshift-apps/fmn/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/fmn/templates/deploymentconfig.yml
@@ -37,6 +37,18 @@ spec:
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-frontend.sh"
+          readinessProbe:
+            timeoutSeconds: 1
+            initialDelaySeconds: 10
+            httpGet:
+              path: /
+              port: 8080
+          livenessProbe:
+            timeoutSeconds: 1
+            initialDelaySeconds: 5
+            httpGet:
+              path: /
+              port: 8080
       volumes:
         - name: httpdir-volume
           emptyDir: {}
@@ -108,6 +120,8 @@ spec:
                 secretKeyRef:
                   name: fmn
                   key: oidc-client-secret
+            - name: KRB5_CONFIG
+              value: /etc/ipa/krb5.conf
             - name: KRB5_CLIENT_KTNAME
               value: /etc/keytabs/service.keytab
 
@@ -182,6 +196,8 @@ spec:
           env:
             - name: APP_SCRIPT
               value: ".s2i/run-consumer.sh"
+            - name: KRB5_CONFIG
+              value: /etc/ipa/krb5.conf
             - name: KRB5_CLIENT_KTNAME
               value: /etc/keytabs/service.keytab
       volumes: