[DO NOT MERGE][CLOUD-2453][KEYCLOAK-7098] Deploy RH-SSO pod only if DB service is ready

docs/templates/sso72-mysql-persistent.adoc

@@ -199,7 +199,7 @@ for more information.
 |=======================================================================
 |Deployment |Variable name |Description |Example value
 
-.31+| `${APPLICATION_NAME}`
+.33+| `${APPLICATION_NAME}`
 |`DB_SERVICE_PREFIX_MAPPING` | -- | `${APPLICATION_NAME}-mysql=DB`
 |`DB_JNDI` | Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/mysql | `${DB_JNDI}`
 |`DB_USERNAME` | Database user name | `${DB_USERNAME}`
@@ -223,6 +223,8 @@ for more information.
 |`JGROUPS_ENCRYPT_NAME` | The name associated with the server certificate (e.g. secret-key) | `${JGROUPS_ENCRYPT_NAME}`
 |`JGROUPS_ENCRYPT_PASSWORD` | The password for the keystore and certificate (e.g. password) | `${JGROUPS_ENCRYPT_PASSWORD}`
 |`JGROUPS_CLUSTER_PASSWORD` | JGroups cluster password | `${JGROUPS_CLUSTER_PASSWORD}`
+|`SERVICE_WAIT_NAME` | -- | `${APPLICATION_NAME}-mysql`
+|`SERVICE_WAIT_INTRO_MESSAGE` | -- | Ensure a persistent volume is available for the "${APPLICATION_NAME}-mysql-claim" or a storage class is set.
 |`SSO_ADMIN_USERNAME` | RH-SSO Server administrator username | `${SSO_ADMIN_USERNAME}`
 |`SSO_ADMIN_PASSWORD` | RH-SSO Server administrator password | `${SSO_ADMIN_PASSWORD}`
 |`SSO_REALM` | Realm to be created in the RH-SSO server (e.g. demorealm). | `${SSO_REALM}`

docs/templates/sso72-mysql.adoc

@@ -198,7 +198,7 @@ for more information.
 |=======================================================================
 |Deployment |Variable name |Description |Example value
 
-.31+| `${APPLICATION_NAME}`
+.32+| `${APPLICATION_NAME}`
 |`DB_SERVICE_PREFIX_MAPPING` | -- | `${APPLICATION_NAME}-mysql=DB`
 |`DB_JNDI` | Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/mysql | `${DB_JNDI}`
 |`DB_USERNAME` | Database user name | `${DB_USERNAME}`
@@ -222,6 +222,7 @@ for more information.
 |`JGROUPS_ENCRYPT_NAME` | The name associated with the server certificate (e.g. secret-key) | `${JGROUPS_ENCRYPT_NAME}`
 |`JGROUPS_ENCRYPT_PASSWORD` | The password for the keystore and certificate (e.g. password) | `${JGROUPS_ENCRYPT_PASSWORD}`
 |`JGROUPS_CLUSTER_PASSWORD` | JGroups cluster password | `${JGROUPS_CLUSTER_PASSWORD}`
+|`SERVICE_WAIT_NAME` | -- | `${APPLICATION_NAME}-mysql`
 |`SSO_ADMIN_USERNAME` | RH-SSO Server administrator username | `${SSO_ADMIN_USERNAME}`
 |`SSO_ADMIN_PASSWORD` | RH-SSO Server administrator password | `${SSO_ADMIN_PASSWORD}`
 |`SSO_REALM` | Realm to be created in the RH-SSO server (e.g. demorealm). | `${SSO_REALM}`

docs/templates/sso72-postgresql-persistent.adoc

@@ -196,7 +196,7 @@ for more information.
 |=======================================================================
 |Deployment |Variable name |Description |Example value
 
-.31+| `${APPLICATION_NAME}`
+.33+| `${APPLICATION_NAME}`
 |`DB_SERVICE_PREFIX_MAPPING` | -- | `${APPLICATION_NAME}-postgresql=DB`
 |`DB_JNDI` | Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql | `${DB_JNDI}`
 |`DB_USERNAME` | Database user name | `${DB_USERNAME}`
@@ -220,6 +220,8 @@ for more information.
 |`JGROUPS_ENCRYPT_NAME` | The name associated with the server certificate (e.g. secret-key) | `${JGROUPS_ENCRYPT_NAME}`
 |`JGROUPS_ENCRYPT_PASSWORD` | The password for the keystore and certificate (e.g. password) | `${JGROUPS_ENCRYPT_PASSWORD}`
 |`JGROUPS_CLUSTER_PASSWORD` | JGroups cluster password | `${JGROUPS_CLUSTER_PASSWORD}`
+|`SERVICE_WAIT_NAME` | -- | `${APPLICATION_NAME}-postgresql`
+|`SERVICE_WAIT_INTRO_MESSAGE` | -- | Ensure a persistent volume is available for the "${APPLICATION_NAME}-postgresql-claim" or a storage class is set.
 |`SSO_ADMIN_USERNAME` | RH-SSO Server administrator username | `${SSO_ADMIN_USERNAME}`
 |`SSO_ADMIN_PASSWORD` | RH-SSO Server administrator password | `${SSO_ADMIN_PASSWORD}`
 |`SSO_REALM` | Realm to be created in the RH-SSO server (e.g. demorealm). | `${SSO_REALM}`

docs/templates/sso72-postgresql.adoc

@@ -195,7 +195,7 @@ for more information.
 |=======================================================================
 |Deployment |Variable name |Description |Example value
 
-.31+| `${APPLICATION_NAME}`
+.32+| `${APPLICATION_NAME}`
 |`DB_SERVICE_PREFIX_MAPPING` | -- | `${APPLICATION_NAME}-postgresql=DB`
 |`DB_JNDI` | Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql | `${DB_JNDI}`
 |`DB_USERNAME` | Database user name | `${DB_USERNAME}`
@@ -219,6 +219,7 @@ for more information.
 |`JGROUPS_ENCRYPT_NAME` | The name associated with the server certificate (e.g. secret-key) | `${JGROUPS_ENCRYPT_NAME}`
 |`JGROUPS_ENCRYPT_PASSWORD` | The password for the keystore and certificate (e.g. password) | `${JGROUPS_ENCRYPT_PASSWORD}`
 |`JGROUPS_CLUSTER_PASSWORD` | JGroups cluster password | `${JGROUPS_CLUSTER_PASSWORD}`
+|`SERVICE_WAIT_NAME` | -- | `${APPLICATION_NAME}-postgresql`
 |`SSO_ADMIN_USERNAME` | RH-SSO Server administrator username | `${SSO_ADMIN_USERNAME}`
 |`SSO_ADMIN_PASSWORD` | RH-SSO Server administrator password | `${SSO_ADMIN_PASSWORD}`
 |`SSO_REALM` | Realm to be created in the RH-SSO server (e.g. demorealm). | `${SSO_REALM}`

docs/templates/sso72-x509-mysql-persistent.adoc

@@ -181,7 +181,7 @@ for more information.
 |=======================================================================
 |Deployment |Variable name |Description |Example value
 
-.20+| `${APPLICATION_NAME}`
+.22+| `${APPLICATION_NAME}`
 |`DB_SERVICE_PREFIX_MAPPING` | -- | `${APPLICATION_NAME}-mysql=DB`
 |`DB_JNDI` | Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/mysql | `${DB_JNDI}`
 |`DB_USERNAME` | Database user name | `${DB_USERNAME}`
@@ -196,6 +196,8 @@ for more information.
 |`OPENSHIFT_DNS_PING_SERVICE_PORT` | -- | 8888
 |X509_CA_BUNDLE | -- | `/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt`
 |`JGROUPS_CLUSTER_PASSWORD` | The password for the JGroups cluster. | `${JGROUPS_CLUSTER_PASSWORD}`
+|`SERVICE_WAIT_NAME` | -- | `${APPLICATION_NAME}-mysql`
+|`SERVICE_WAIT_INTRO_MESSAGE` | -- | Ensure a persistent volume is available for the "${APPLICATION_NAME}-mysql-claim" or a storage class is set.
 |`JGROUPS_ENCRYPT_PROTOCOL` | -- | `ASYM_ENCRYPT`
 |`SSO_ADMIN_USERNAME` | RH-SSO Server administrator username | `${SSO_ADMIN_USERNAME}`
 |`SSO_ADMIN_PASSWORD` | RH-SSO Server administrator password | `${SSO_ADMIN_PASSWORD}`

docs/templates/sso72-x509-postgresql-persistent.adoc

@@ -178,7 +178,7 @@ for more information.
 |=======================================================================
 |Deployment |Variable name |Description |Example value
 
-.20+| `${APPLICATION_NAME}`
+.22+| `${APPLICATION_NAME}`
 |`DB_SERVICE_PREFIX_MAPPING` | -- | `${APPLICATION_NAME}-postgresql=DB`
 |`DB_JNDI` | Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql | `${DB_JNDI}`
 |`DB_USERNAME` | Database user name | `${DB_USERNAME}`
@@ -193,6 +193,8 @@ for more information.
 |`OPENSHIFT_DNS_PING_SERVICE_PORT` | -- | 8888
 |X509_CA_BUNDLE | -- | `/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt`
 |`JGROUPS_CLUSTER_PASSWORD` | The password for the JGroups cluster. | `${JGROUPS_CLUSTER_PASSWORD}`
+|`SERVICE_WAIT_NAME` | -- | `${APPLICATION_NAME}-postgresql`
+|`SERVICE_WAIT_INTRO_MESSAGE` | -- | Ensure a persistent volume is available for the "${APPLICATION_NAME}-postgresql-claim" or a storage class is set.
 |`JGROUPS_ENCRYPT_PROTOCOL` | -- | `ASYM_ENCRYPT`
 |`SSO_ADMIN_USERNAME` | RH-SSO Server administrator username | `${SSO_ADMIN_USERNAME}`
 |`SSO_ADMIN_PASSWORD` | RH-SSO Server administrator password | `${SSO_ADMIN_PASSWORD}`

image.yaml

@@ -18,21 +18,9 @@ labels:
     - name: "io.openshift.s2i.scripts-url"
       value: "image:///usr/local/s2i"
 envs:
-    - name: "SSO_ADMIN_USERNAME"
-      example: "admin"
-      description: "Username of the administrator account for the 'master' realm of the SSO server. Required. If no value is specified, it is auto generated and displayed as an OpenShift Instructional message when the template is instantiated."
-    - name: "SSO_ADMIN_PASSWORD"
-      example: "hardtoguess"
-      description: "Password of the administrator account for the 'master' realm of the SSO server. Required. If no value is specified, it is auto generated and displayed as an OpenShift Instructional message when the template is instantiated."
     - name: "SSO_REALM"
       example: "demo"
       description: "SSO Realm created if this ENV is provided"
-    - name: "SSO_SERVICE_USERNAME"
-      example: "username"
-      description: "SSO Server service username with rights to create Client configurations in SSO_REALM. This user is created if this ENV is provided"
-    - name: "SSO_SERVICE_PASSWORD"
-      example: "password"
-      description: "Password for SSO_SERVICE_USERNAME"
     - name: "SSO_TRUSTSTORE"
       example: "truststore.jks"
       description: "The name of the truststore file within the secret"
@@ -45,8 +33,8 @@ envs:
     - name: "SSO_TRUSTSTORE_SECRET"
       example: "truststore-secret"
       description: "The name of the secret containing the truststore file. Used for volume secretName"
-    - name: SCRIPT_DEBUG
-      description: If set to true, ensurses that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed.
+    - name: "SCRIPT_DEBUG"
+      description: "If set to true, ensurses that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed."
       example: "true"
 ports:
     - value: 8443

templates/sso72-mysql-persistent.json

@@ -629,6 +629,14 @@
                                         "name": "JGROUPS_CLUSTER_PASSWORD",
                                         "value": "${JGROUPS_CLUSTER_PASSWORD}"
                                     },
+                                    {
+                                        "name": "SERVICE_WAIT_NAME",
+                                        "value": "${APPLICATION_NAME}-mysql"
+                                    },
+                                    {
+                                        "name": "SERVICE_WAIT_INTRO_MESSAGE",
+                                        "value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-mysql-claim\" or a storage class is set."
+                                    },
                                     {
                                         "name": "SSO_ADMIN_USERNAME",
                                         "value": "${SSO_ADMIN_USERNAME}"

templates/sso72-mysql.json

@@ -629,6 +629,10 @@
                                         "name": "JGROUPS_CLUSTER_PASSWORD",
                                         "value": "${JGROUPS_CLUSTER_PASSWORD}"
                                     },
+                                    {
+                                        "name": "SERVICE_WAIT_NAME",
+                                        "value": "${APPLICATION_NAME}-mysql"
+                                    },
                                     {
                                         "name": "SSO_ADMIN_USERNAME",
                                         "value": "${SSO_ADMIN_USERNAME}"

templates/sso72-postgresql-persistent.json

@@ -611,6 +611,14 @@
                                         "name": "JGROUPS_CLUSTER_PASSWORD",
                                         "value": "${JGROUPS_CLUSTER_PASSWORD}"
                                     },
+                                    {
+                                        "name": "SERVICE_WAIT_NAME",
+                                        "value": "${APPLICATION_NAME}-postgresql"
+                                    },
+                                    {
+                                        "name": "SERVICE_WAIT_INTRO_MESSAGE",
+                                        "value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-postgresql-claim\" or a storage class is set."
+                                    },
                                     {
                                         "name": "SSO_ADMIN_USERNAME",
                                         "value": "${SSO_ADMIN_USERNAME}"

templates/sso72-postgresql.json

@@ -611,6 +611,10 @@
                                         "name": "JGROUPS_CLUSTER_PASSWORD",
                                         "value": "${JGROUPS_CLUSTER_PASSWORD}"
                                     },
+                                    {
+                                        "name": "SERVICE_WAIT_NAME",
+                                        "value": "${APPLICATION_NAME}-postgresql"
+                                    },
                                     {
                                         "name": "SSO_ADMIN_USERNAME",
                                         "value": "${SSO_ADMIN_USERNAME}"

templates/sso72-x509-mysql-persistent.json

@@ -440,6 +440,14 @@
                                         "name": "JGROUPS_CLUSTER_PASSWORD",
                                         "value": "${JGROUPS_CLUSTER_PASSWORD}"
                                     },
+                                    {
+                                        "name": "SERVICE_WAIT_NAME",
+                                        "value": "${APPLICATION_NAME}-mysql"
+                                    },
+                                    {
+                                        "name": "SERVICE_WAIT_INTRO_MESSAGE",
+                                        "value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-mysql-claim\" or a storage class is set."
+                                    },
                                     {
                                         "name": "JGROUPS_ENCRYPT_PROTOCOL",
                                         "value": "ASYM_ENCRYPT"

templates/sso72-x509-postgresql-persistent.json

@@ -422,6 +422,14 @@
                                         "name": "JGROUPS_CLUSTER_PASSWORD",
                                         "value": "${JGROUPS_CLUSTER_PASSWORD}"
                                     },
+                                    {
+                                        "name": "SERVICE_WAIT_NAME",
+                                        "value": "${APPLICATION_NAME}-postgresql"
+                                    },
+                                    {
+                                        "name": "SERVICE_WAIT_INTRO_MESSAGE",
+                                        "value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-postgresql-claim\" or a storage class is set."
+                                    },
                                     {
                                         "name": "JGROUPS_ENCRYPT_PROTOCOL",
                                         "value": "ASYM_ENCRYPT"