Merge pull request #240 from ASzc/RHSSO-1824

drichtarik · web-flow · commit f709b6ef0ea4 · 2022-03-14T10:59:47.000+01:00
RHSSO-1824 Update versions for RH-SSO 7.5.2
diff --git a/image.yaml b/image.yaml
@@ -12,7 +12,7 @@ labels:
     - name: "org.jboss.product"
       value: &product "sso"
     - name: "org.jboss.product.version"
-      value: &product_version "7.5.1.GA"
+      value: &product_version "7.5.2.GA"
     - name: "org.jboss.product.sso.version"
       value: *product_version
     - name: "io.k8s.description"
@@ -78,12 +78,12 @@ modules:
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
-                  ref: EAP_742_CR1
+                  ref: EAP_743_CR3
 
           - name: jboss-eap-image
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-7-image.git
-                  ref: EAP_742_CR1_2
+                  ref: EAP_743_CR3
 
           - name: wildfly-cekit-modules
             git:
diff --git a/modules/eap/setup/eap/modules/module.yaml b/modules/eap/setup/eap/modules/module.yaml
@@ -31,11 +31,11 @@ ports:
 artifacts:
 - name: eap-image-maven-repo
   target: maven-repo.zip
-  md5: 115acd5c7fbcaea84f843c593e850515
-  url: http://$DOWNLOAD_SERVER/released/middleware/eap7/7.4.2/jboss-eap-7.4.2-image-builder-maven-repository.zip
-# CIAM-711: Update RH-SSO server overlay to 'RH-SSO 7.5.0.CR4' build
+  md5: 2c0ab034200cafbffb0b808bf2f59e67
+  url: http://$DOWNLOAD_SERVER/released/middleware/eap7/7.4.3/jboss-eap-7.4.3-image-builder-maven-repository.zip
+# RHSSO-1824: Update RH-SSO server overlay to 'RH-SSO 7.5.2.CR1' build
 - name: keycloak-server-overlay.zip
-  md5: 4150d09f7bf5d524b4173f8850a06617
+  md5: 7ea126bb6d903c88727fa3636150c63a
 # List remaining (particular RH-SSO build independent) artifacts below
 - name: txn-recovery-marker-jdbc-common
   target: txn-recovery-marker-jdbc-common-1.1.4.Final-redhat-00001.jar
@@ -72,9 +72,9 @@ labels:
 - name: "org.jboss.product"
   value: "eap"
 - name: "org.jboss.product.version"
-  value: "7.4.2"
+  value: "7.4.3"
 - name: "org.jboss.product.eap.version"
-  value: "7.4.2"
+  value: "7.4.3"
 - name: "com.redhat.deployments-dir"
   value: "/opt/eap/standalone/deployments"
 - name: "com.redhat.dev-mode"
@@ -94,15 +94,15 @@ labels:
 envs:
 - name: "WILDFLY_VERSION"
   description: "Mandatory. WildFly server version."
-  value: "7.4.2.GA-redhat-00002"
+  value: "7.4.3.GA-redhat-00002"
 - name: "LAUNCH_JBOSS_IN_BACKGROUND"
   value: "true"
 - name: "JBOSS_PRODUCT"
   value: "eap"
 - name: "JBOSS_EAP_VERSION"
-  value: "7.4.2"
+  value: "7.4.3"
 - name: "PRODUCT_VERSION"
-  value: "7.4.2"
+  value: "7.4.3"
 - name: "EAP_FULL_GROUPID"
   value: "org.jboss.eap"
 - name: "JBOSS_HOME"
diff --git a/modules/sso/apply/patches/module.yaml b/modules/sso/apply/patches/module.yaml
@@ -2,20 +2,20 @@ schema_version: 1
 name: sso.apply.patches
 version: '1.0'
 description: Module to apply any possibly needed EAP / RH-SSO one-off patches via jboss-cli.sh
-execute:
-- script: apply-eap-rh-sso-one-off-patches.sh
-
-artifacts:
-# CIAM-1975
-- md5: 8f54d950472fb9abf34e2f965303a5fc
-  name: rhsso-1974.zip
-  target: eap-one-off-rhsso-1974.zip
-  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/sso/7.5.1/patches/rhsso-1974.zip
-# CIAM-2055
-- md5: e131a6a7ab26779951981665b9e63919
-  name: rhsso-2054.zip
-  target: eap-one-off-rhsso-2054.zip
-  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/sso/7.5.1/patches/rhsso-2054.zip
+#execute:
+#- script: apply-eap-rh-sso-one-off-patches.sh
+#
+#artifacts:
+## CIAM-1975
+#- md5: 8f54d950472fb9abf34e2f965303a5fc
+#  name: rhsso-1974.zip
+#  target: eap-one-off-rhsso-1974.zip
+#  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/sso/7.5.1/patches/rhsso-1974.zip
+## CIAM-2055
+#- md5: e131a6a7ab26779951981665b9e63919
+#  name: rhsso-2054.zip
+#  target: eap-one-off-rhsso-2054.zip
+#  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/sso/7.5.1/patches/rhsso-2054.zip
 
 # Note:
 #
diff --git a/templates/sso75-https.json b/templates/sso75-https.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss,hidden",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK (Ephemeral with passthrough TLS)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-https",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.",
     "parameters": [
diff --git a/templates/sso75-image-stream.json b/templates/sso75-image-stream.json
@@ -7,11 +7,11 @@
             "description": "Red Hat Single Sign-On 7.5 on OpenJDK",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
-            "version": "7.5.1.GA"
+            "version": "7.5.2.GA"
         }
     },
     "labels": {
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "spec": {
         "tags": [
diff --git a/templates/sso75-ocp4-x509-https.json b/templates/sso75-ocp4-x509-https.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK (Ephemeral)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-ocp4-x509-https",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.",
     "parameters": [
diff --git a/templates/sso75-ocp4-x509-postgresql-persistent.json b/templates/sso75-ocp4-x509-postgresql-persistent.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL (Persistent)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-ocp4-x509-postgresql-persistent",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.",
     "parameters": [
diff --git a/templates/sso75-postgresql-persistent.json b/templates/sso75-postgresql-persistent.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss,hidden",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL (Persistent with passthrough TLS)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-postgresql-persistent",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new persistent RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.",
     "parameters": [
diff --git a/templates/sso75-postgresql.json b/templates/sso75-postgresql.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss,hidden",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL (Ephemeral with passthrough TLS)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-postgresql",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new RH-SSO service (using PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the following secrets: \"${HTTPS_SECRET}\" containing the ${HTTPS_KEYSTORE} file used for serving secure content; \"${JGROUPS_ENCRYPT_SECRET}\" containing the ${JGROUPS_ENCRYPT_KEYSTORE} file used for securing JGroups communications; \"${SSO_TRUSTSTORE_SECRET}\" containing the ${SSO_TRUSTSTORE} file used for securing RH-SSO requests.",
     "parameters": [
diff --git a/templates/sso75-x509-https.json b/templates/sso75-x509-https.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK (Ephemeral)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-x509-https",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new RH-SSO service has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, and server truststore used for securing RH-SSO requests were automatically created via OpenShift's service serving x509 certificate secrets.",
     "parameters": [
diff --git a/templates/sso75-x509-postgresql-persistent.json b/templates/sso75-x509-postgresql-persistent.json
@@ -5,7 +5,7 @@
         "annotations": {
             "iconClass" : "icon-sso",
             "tags" : "sso,keycloak,jboss",
-            "version": "7.5.1.GA",
+            "version": "7.5.2.GA",
             "openshift.io/display-name": "Red Hat Single Sign-On 7.5 on OpenJDK + PostgreSQL SSL/TLS (Persistent)",
             "openshift.io/provider-display-name": "Red Hat, Inc.",
             "description": "An example application based on RH-SSO 7.5 on OpenJDK image. For more information about using this template, see https://github.com/jboss-container-images/redhat-sso-7-openshift-image/tree/sso75-cpaas-dev/docs.",
@@ -17,7 +17,7 @@
     },
     "labels": {
         "template": "sso75-x509-postgresql-persistent",
-        "rhsso": "7.5.1.GA"
+        "rhsso": "7.5.2.GA"
     },
     "message": "A new persistent RH-SSO service (using SSL/TLS secured PostgreSQL) has been created in your project. The admin username/password for accessing the master realm via the RH-SSO console is ${SSO_ADMIN_USERNAME}/${SSO_ADMIN_PASSWORD}. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}. The HTTPS keystore used for serving secure content, the JGroups keystore used for securing JGroups communications, the server truststore used for securing RH-SSO requests, and SSL/TLS certificate & private key used to run PostgreSQL server with SSL/TLS support were automatically created via OpenShift's service serving x509 certificate secrets.",
     "parameters": [
