diff --git a/Makefile b/Makefile index 23000c71..e07aea93 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ CONSUMER_NAMESPACES=${NAMESPACE} PROJECT=keycloak-operator REG=quay.io SHELL=/bin/bash -TAG=v1.2.2 +TAG=v1.2.3 PKG=github.com/integr8ly/keycloak-operator TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq") TEST_POD_NAME=keycloak-operator-test diff --git a/client.yaml b/client.yaml index f1f9caae..719d680e 100644 --- a/client.yaml +++ b/client.yaml @@ -82,7 +82,7 @@ spec: - offline_access - uma_authorization username: admin - version: 7.2.2.GA + version: 7.2.6.GA status: attempts: 0 message: "" diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 0677fd0d..e3ecbad6 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: keycloak-operator - image: quay.io/integreatly/keycloak-operator:v1.2.2 + image: quay.io/integreatly/keycloak-operator:v1.2.3 ports: - containerPort: 60000 name: metrics diff --git a/deploy/template/sso72-x509-postgresql-persistent.json b/deploy/template/sso72-x509-postgresql-persistent.json index c9a13947..db3af7eb 100644 --- a/deploy/template/sso72-x509-postgresql-persistent.json +++ b/deploy/template/sso72-x509-postgresql-persistent.json @@ -1,45 +1,171 @@ { - "apiVersion": "v1", "kind": "Template", - "labels": { - "template": "sso72-x509-postgresql-persistent", - "xpaas": "1.4.14" - }, - "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.", + "apiVersion": "v1", "metadata": { "annotations": { - "description": "An example RH-SSO 7 application with a PostgreSQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", - "iconClass": "icon-sso", + "iconClass" : "icon-sso", + "tags" : "sso,keycloak,jboss", + "version": "rh-sso-7.2-v1.4.0", "openshift.io/display-name": "Red Hat Single Sign-On 7.2 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "tags": "sso,keycloak,jboss", - "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "description": "An example RH-SSO 7 application with a PostgreSQL database. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Single Sign-On 7.2 server based deployment, deployment configuration for PostgreSQL using persistence, and securing RH-SSO communication using re-encrypt TLS.", - "template.openshift.io/support-url": "https://access.redhat.com", - "version": "1.4.14" + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-single-sign-on/", + "template.openshift.io/support-url": "https://access.redhat.com" }, - "creationTimestamp": "2018-08-27T13:34:21Z", - "name": "sso72-x509-postgresql-persistent", - "namespace": "openshift", - "resourceVersion": "1713", - "selfLink": "/apis/template.openshift.io/v1/namespaces/openshift/templates/sso72-x509-postgresql-persistent", - "uid": "e8050059-a9fd-11e8-89ec-0aa1040ba90a" + "name": "sso72-x509-postgresql-persistent" }, + "labels": { + "template": "sso72-x509-postgresql-persistent", + "rh-sso": "7.2-v1.4.0" + }, + "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": [ + { + "displayName": "Application Name", + "description": "The name for the application.", + "name": "APPLICATION_NAME", + "value": "sso", + "required": true + }, + { + "displayName": "JGroups Cluster Password", + "description": "The password for the JGroups cluster.", + "name": "JGROUPS_CLUSTER_PASSWORD", + "from": "[a-zA-Z0-9]{32}", + "generate": "expression", + "required": true + }, + { + "displayName": "Database JNDI Name", + "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", + "name": "DB_JNDI", + "value": "java:jboss/datasources/KeycloakDS", + "required": false + }, + { + "displayName": "Database Name", + "description": "Database name", + "name": "DB_DATABASE", + "value": "root", + "required": true + }, + { + "displayName": "Datasource Minimum Pool Size", + "description": "Sets xa-pool/min-pool-size for the configured datasource.", + "name": "DB_MIN_POOL_SIZE", + "required": false + }, + { + "displayName": "Datasource Maximum Pool Size", + "description": "Sets xa-pool/max-pool-size for the configured datasource.", + "name": "DB_MAX_POOL_SIZE", + "required": false + }, + { + "displayName": "Datasource Transaction Isolation", + "description": "Sets transaction-isolation for the configured datasource.", + "name": "DB_TX_ISOLATION", + "required": false + }, + { + "displayName": "PostgreSQL Maximum number of connections", + "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions.", + "name": "POSTGRESQL_MAX_CONNECTIONS", + "required": false + }, + { + "displayName": "PostgreSQL Shared Buffers", + "description": "Configures how much memory is dedicated to PostgreSQL for caching data.", + "name": "POSTGRESQL_SHARED_BUFFERS", + "required": false + }, + { + "displayName": "Database Username", + "description": "Database user name", + "name": "DB_USERNAME", + "from": "user[a-zA-Z0-9]{3}", + "generate": "expression", + "required": true + }, + { + "displayName": "Database Password", + "description": "Database user password", + "name": "DB_PASSWORD", + "from": "[a-zA-Z0-9]{32}", + "generate": "expression", + "required": true + }, + { + "displayName": "Database Volume Capacity", + "description": "Size of persistent storage for database volume.", + "name": "VOLUME_CAPACITY", + "value": "1Gi", + "required": true + }, + { + "displayName": "ImageStream Namespace", + "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", + "name": "IMAGE_STREAM_NAMESPACE", + "value": "openshift", + "required": true + }, + { + "displayName": "RH-SSO Administrator Username", + "description": "RH-SSO Server administrator username", + "name": "SSO_ADMIN_USERNAME", + "from": "[a-zA-Z0-9]{8}", + "generate": "expression", + "required": true + }, + { + "displayName": "RH-SSO Administrator Password", + "description": "RH-SSO Server administrator password", + "name": "SSO_ADMIN_PASSWORD", + "from": "[a-zA-Z0-9]{32}", + "generate": "expression", + "required": true + }, + { + "displayName": "RH-SSO Realm", + "description": "Realm to be created in the RH-SSO server (e.g. demorealm).", + "name": "SSO_REALM", + "value": "", + "required": false + }, + { + "displayName": "RH-SSO Service Username", + "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm.", + "name": "SSO_SERVICE_USERNAME", + "value": "", + "required": false + }, + { + "displayName": "RH-SSO Service Password", + "description": "The password for the RH-SSO service user.", + "name": "SSO_SERVICE_PASSWORD", + "value": "", + "required": false + }, + { + "displayName": "PostgreSQL Image Stream Tag", + "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", + "name": "POSTGRESQL_IMAGE_STREAM_TAG", + "value": "9.5", + "required": true + }, + { + "displayName": "Container Memory Limit", + "description": "Container memory limit.", + "name": "MEMORY_LIMIT", + "value": "1Gi", + "required": false + } + ], "objects": [ { - "apiVersion": "v1", "kind": "Service", - "metadata": { - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]", - "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret" - }, - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" - }, + "apiVersion": "v1", "spec": { "ports": [ { @@ -50,20 +176,22 @@ "selector": { "deploymentConfig": "${APPLICATION_NAME}" } - } - }, - { - "apiVersion": "v1", - "kind": "Service", + }, "metadata": { - "annotations": { - "description": "The database server's port." - }, + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}-postgresql" - }, + "annotations": { + "description": "The web server's https port.", + "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-https-secret", + "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" + } + } + }, + { + "kind": "Service", + "apiVersion": "v1", "spec": { "ports": [ { @@ -74,22 +202,20 @@ "selector": { "deploymentConfig": "${APPLICATION_NAME}-postgresql" } - } - }, - { - "apiVersion": "v1", - "kind": "Service", + }, "metadata": { - "annotations": { - "description": "The JGroups ping port for clustering.", - "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", - "service.alpha.openshift.io/serving-cert-secret-name": "sso-x509-jgroups-secret" - }, + "name": "${APPLICATION_NAME}-postgresql", "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}-ping" - }, + "annotations": { + "description": "The database server's port." + } + } + }, + { + "kind": "Service", + "apiVersion": "v1", "spec": { "clusterIP": "None", "ports": [ @@ -101,58 +227,144 @@ "selector": { "deploymentConfig": "${APPLICATION_NAME}" } + }, + "metadata": { + "name": "${APPLICATION_NAME}-ping", + "labels": { + "application": "${APPLICATION_NAME}" + }, + "annotations": { + "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true", + "description": "The JGroups ping port for clustering." + } } }, { + "kind": "Route", "apiVersion": "v1", "id": "${APPLICATION_NAME}-https", - "kind": "Route", "metadata": { - "annotations": { - "description": "Route for application's https service." - }, + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" }, - "name": "${APPLICATION_NAME}" + "annotations": { + "description": "Route for application's https service." + } }, "spec": { - "tls": { - "termination": "reencrypt" - }, "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "reencrypt" } } }, { - "apiVersion": "v1", "kind": "DeploymentConfig", + "apiVersion": "v1", "metadata": { + "name": "${APPLICATION_NAME}", "labels": { "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" + } }, "spec": { + "strategy": { + "type": "Recreate" + }, + "triggers": [ + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "${APPLICATION_NAME}" + ], + "from": { + "kind": "ImageStreamTag", + "namespace": "${IMAGE_STREAM_NAMESPACE}", + "name": "redhat-sso72-openshift:1.4" + } + } + }, + { + "type": "ConfigChange" + } + ], "replicas": 1, "selector": { "deploymentConfig": "${APPLICATION_NAME}" }, - "strategy": { - "type": "Recreate" - }, "template": { "metadata": { + "name": "${APPLICATION_NAME}", "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}" + "deploymentConfig": "${APPLICATION_NAME}", + "application": "${APPLICATION_NAME}" + } }, "spec": { + "terminationGracePeriodSeconds": 75, "containers": [ { + "name": "${APPLICATION_NAME}", + "image": "${APPLICATION_NAME}", + "imagePullPolicy": "Always", + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, + "volumeMounts": [ + { + "name": "sso-x509-https-volume", + "mountPath": "/etc/x509/https", + "readOnly": true + } + ], + "livenessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/livenessProbe.sh" + ] + }, + "initialDelaySeconds": 60 + }, + "readinessProbe": { + "exec": { + "command": [ + "/bin/bash", + "-c", + "/opt/eap/bin/readinessProbe.sh" + ] + } + }, + "ports": [ + { + "name": "jolokia", + "containerPort": 8778, + "protocol": "TCP" + }, + { + "name": "http", + "containerPort": 8080, + "protocol": "TCP" + }, + { + "name": "https", + "containerPort": 8443, + "protocol": "TCP" + }, + { + "name": "ping", + "containerPort": 8888, + "protocol": "TCP" + } + ], "env": [ { "name": "DB_SERVICE_PREFIX_MAPPING", @@ -211,155 +423,121 @@ "value": "${JGROUPS_CLUSTER_PASSWORD}" }, { - "name": "SSO_ADMIN_USERNAME", - "value": "${SSO_ADMIN_USERNAME}" - }, - { - "name": "SSO_ADMIN_PASSWORD", - "value": "${SSO_ADMIN_PASSWORD}" - }, - { - "name": "SSO_REALM", - "value": "${SSO_REALM}" - }, - { - "name": "SSO_SERVICE_USERNAME", - "value": "${SSO_SERVICE_USERNAME}" - }, - { - "name": "SSO_SERVICE_PASSWORD", - "value": "${SSO_SERVICE_PASSWORD}" - } - ], - "image": "${APPLICATION_NAME}", - "imagePullPolicy": "Always", - "livenessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/livenessProbe.sh" - ] - }, - "initialDelaySeconds": 60 - }, - "name": "${APPLICATION_NAME}", - "ports": [ - { - "containerPort": 8778, - "name": "jolokia", - "protocol": "TCP" + "name": "JGROUPS_ENCRYPT_PROTOCOL", + "value": "ASYM_ENCRYPT" }, { - "containerPort": 8080, - "name": "http", - "protocol": "TCP" + "name": "SSO_ADMIN_USERNAME", + "value": "${SSO_ADMIN_USERNAME}" }, { - "containerPort": 8443, - "name": "https", - "protocol": "TCP" + "name": "SSO_ADMIN_PASSWORD", + "value": "${SSO_ADMIN_PASSWORD}" }, { - "containerPort": 8888, - "name": "ping", - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/bash", - "-c", - "/opt/eap/bin/readinessProbe.sh" - ] - } - }, - "resources": { - "limits": { - "memory": "${MEMORY_LIMIT}" - } - }, - "volumeMounts": [ + "name": "SSO_REALM", + "value": "${SSO_REALM}" + }, { - "mountPath": "/etc/x509/https", - "name": "sso-x509-https-volume", - "readOnly": true + "name": "SSO_SERVICE_USERNAME", + "value": "${SSO_SERVICE_USERNAME}" }, { - "mountPath": "/etc/x509/jgroups", - "name": "sso-x509-jgroups-volume", - "readOnly": true + "name": "SSO_SERVICE_PASSWORD", + "value": "${SSO_SERVICE_PASSWORD}" } ] } ], - "terminationGracePeriodSeconds": 75, "volumes": [ { "name": "sso-x509-https-volume", "secret": { "secretName": "sso-x509-https-secret" } - }, - { - "name": "sso-x509-jgroups-volume", - "secret": { - "secretName": "sso-x509-jgroups-secret" - } } ] } + } + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "${APPLICATION_NAME}-postgresql", + "labels": { + "application": "${APPLICATION_NAME}" + } + }, + "spec": { + "strategy": { + "type": "Recreate" }, "triggers": [ { + "type": "ImageChange", "imageChangeParams": { "automatic": true, "containerNames": [ - "${APPLICATION_NAME}" + "${APPLICATION_NAME}-postgresql" ], "from": { "kind": "ImageStreamTag", - "name": "redhat-sso72-openshift:1.1", - "namespace": "${IMAGE_STREAM_NAMESPACE}" + "namespace": "${IMAGE_STREAM_NAMESPACE}", + "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}" } - }, - "type": "ImageChange" + } }, { "type": "ConfigChange" } - ] - } - }, - { - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "labels": { - "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-postgresql" - }, - "spec": { + ], "replicas": 1, "selector": { "deploymentConfig": "${APPLICATION_NAME}-postgresql" }, - "strategy": { - "type": "Recreate" - }, "template": { "metadata": { + "name": "${APPLICATION_NAME}-postgresql", "labels": { - "application": "${APPLICATION_NAME}", - "deploymentConfig": "${APPLICATION_NAME}-postgresql" - }, - "name": "${APPLICATION_NAME}-postgresql" + "deploymentConfig": "${APPLICATION_NAME}-postgresql", + "application": "${APPLICATION_NAME}" + } }, "spec": { + "terminationGracePeriodSeconds": 60, "containers": [ { + "name": "${APPLICATION_NAME}-postgresql", + "image": "postgresql", + "imagePullPolicy": "Always", + "ports": [ + { + "containerPort": 5432, + "protocol": "TCP" + } + ], + "readinessProbe": { + "timeoutSeconds": 1, + "initialDelaySeconds": 5, + "exec": { + "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'"] + } + }, + "livenessProbe": { + "timeoutSeconds": 1, + "initialDelaySeconds": 30, + "tcpSocket": { + "port": 5432 + } + }, + "volumeMounts": [ + { + "mountPath": "/var/lib/pgsql/data", + "name": "${APPLICATION_NAME}-postgresql-pvol" + } + ], "env": [ { "name": "POSTGRESQL_USER", @@ -385,44 +563,9 @@ "name": "POSTGRESQL_SHARED_BUFFERS", "value": "${POSTGRESQL_SHARED_BUFFERS}" } - ], - "image": "postgresql", - "imagePullPolicy": "Always", - "livenessProbe": { - "initialDelaySeconds": 30, - "tcpSocket": { - "port": 5432 - }, - "timeoutSeconds": 1 - }, - "name": "${APPLICATION_NAME}-postgresql", - "ports": [ - { - "containerPort": 5432, - "protocol": "TCP" - } - ], - "readinessProbe": { - "exec": { - "command": [ - "/bin/sh", - "-i", - "-c", - "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'" - ] - }, - "initialDelaySeconds": 5, - "timeoutSeconds": 1 - }, - "volumeMounts": [ - { - "mountPath": "/var/lib/pgsql/data", - "name": "${APPLICATION_NAME}-postgresql-pvol" - } ] } ], - "terminationGracePeriodSeconds": 60, "volumes": [ { "name": "${APPLICATION_NAME}-postgresql-pvol", @@ -432,36 +575,17 @@ } ] } - }, - "triggers": [ - { - "imageChangeParams": { - "automatic": true, - "containerNames": [ - "${APPLICATION_NAME}-postgresql" - ], - "from": { - "kind": "ImageStreamTag", - "name": "postgresql:${POSTGRESQL_IMAGE_STREAM_TAG}", - "namespace": "${IMAGE_STREAM_NAMESPACE}" - } - }, - "type": "ImageChange" - }, - { - "type": "ConfigChange" - } - ] + } } }, { "apiVersion": "v1", "kind": "PersistentVolumeClaim", "metadata": { + "name": "${APPLICATION_NAME}-postgresql-claim", "labels": { "application": "${APPLICATION_NAME}" - }, - "name": "${APPLICATION_NAME}-postgresql-claim" + } }, "spec": { "accessModes": [ @@ -474,134 +598,5 @@ } } } - ], - "parameters": [ - { - "description": "The name for the application.", - "displayName": "Application Name", - "name": "APPLICATION_NAME", - "required": true, - "value": "sso" - }, - { - "description": "The password for the JGroups cluster.", - "displayName": "JGroups Cluster Password", - "from": "[a-zA-Z0-9]{32}", - "generate": "expression", - "name": "JGROUPS_CLUSTER_PASSWORD", - "required": true - }, - { - "description": "Database JNDI name used by application to resolve the datasource, e.g. java:/jboss/datasources/postgresql", - "displayName": "Database JNDI Name", - "name": "DB_JNDI", - "value": "java:jboss/datasources/KeycloakDS" - }, - { - "description": "Database name", - "displayName": "Database Name", - "name": "DB_DATABASE", - "required": true, - "value": "root" - }, - { - "description": "Sets xa-pool/min-pool-size for the configured datasource.", - "displayName": "Datasource Minimum Pool Size", - "name": "DB_MIN_POOL_SIZE" - }, - { - "description": "Sets xa-pool/max-pool-size for the configured datasource.", - "displayName": "Datasource Maximum Pool Size", - "name": "DB_MAX_POOL_SIZE" - }, - { - "description": "Sets transaction-isolation for the configured datasource.", - "displayName": "Datasource Transaction Isolation", - "name": "DB_TX_ISOLATION" - }, - { - "description": "The maximum number of client connections allowed. This also sets the maximum number of prepared transactions.", - "displayName": "PostgreSQL Maximum number of connections", - "name": "POSTGRESQL_MAX_CONNECTIONS" - }, - { - "description": "Configures how much memory is dedicated to PostgreSQL for caching data.", - "displayName": "PostgreSQL Shared Buffers", - "name": "POSTGRESQL_SHARED_BUFFERS" - }, - { - "description": "Database user name", - "displayName": "Database Username", - "from": "user[a-zA-Z0-9]{3}", - "generate": "expression", - "name": "DB_USERNAME", - "required": true - }, - { - "description": "Database user password", - "displayName": "Database Password", - "from": "[a-zA-Z0-9]{32}", - "generate": "expression", - "name": "DB_PASSWORD", - "required": true - }, - { - "description": "Size of persistent storage for database volume.", - "displayName": "Database Volume Capacity", - "name": "VOLUME_CAPACITY", - "required": true, - "value": "1Gi" - }, - { - "description": "Namespace in which the ImageStreams for Red Hat Middleware images are installed. These ImageStreams are normally installed in the openshift namespace. You should only need to modify this if you've installed the ImageStreams in a different namespace/project.", - "displayName": "ImageStream Namespace", - "name": "IMAGE_STREAM_NAMESPACE", - "required": true, - "value": "openshift" - }, - { - "description": "RH-SSO Server administrator username", - "displayName": "RH-SSO Administrator Username", - "from": "[a-zA-Z0-9]{8}", - "generate": "expression", - "name": "SSO_ADMIN_USERNAME", - "required": true - }, - { - "description": "RH-SSO Server administrator password", - "displayName": "RH-SSO Administrator Password", - "from": "[a-zA-Z0-9]{32}", - "generate": "expression", - "name": "SSO_ADMIN_PASSWORD", - "required": true - }, - { - "description": "Realm to be created in the RH-SSO server (e.g. demorealm).", - "displayName": "RH-SSO Realm", - "name": "SSO_REALM" - }, - { - "description": "The username used to access the RH-SSO service. This is used by clients to create the appliction client(s) within the specified RH-SSO realm.", - "displayName": "RH-SSO Service Username", - "name": "SSO_SERVICE_USERNAME" - }, - { - "description": "The password for the RH-SSO service user.", - "displayName": "RH-SSO Service Password", - "name": "SSO_SERVICE_PASSWORD" - }, - { - "description": "The tag to use for the \"postgresql\" image stream. Typically, this aligns with the major.minor version of PostgreSQL.", - "displayName": "PostgreSQL Image Stream Tag", - "name": "POSTGRESQL_IMAGE_STREAM_TAG", - "required": true, - "value": "9.5" - }, - { - "description": "Container memory limit.", - "displayName": "Container Memory Limit", - "name": "MEMORY_LIMIT", - "value": "1Gi" - } ] } diff --git a/pkg/keycloak/keycloak.go b/pkg/keycloak/keycloak.go index 7db882cc..8dd9c544 100644 --- a/pkg/keycloak/keycloak.go +++ b/pkg/keycloak/keycloak.go @@ -27,7 +27,7 @@ const ( SSO_APPLICATION_NAME = "sso" SSO_TEMPLATE_PATH = "deploy/template" SSO_TEMPLATE_PATH_ENV_VAR = "TEMPLATE_DIR" - SSO_VERSION = "7.2.2.GA" + SSO_VERSION = "7.2.6.GA" ) //go:generate moq -out sdkCruder_moq.go . SdkCruder diff --git a/version/version.go b/version/version.go index 41d04987..e591847f 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "1.2.2" + Version = "1.2.3" )