From fa5d00a26f458992eb79b146df0de8a533db5485 Mon Sep 17 00:00:00 2001 From: rcernich Date: Thu, 8 Feb 2018 15:41:17 -0700 Subject: [PATCH] CLOUD-2249 secure routes for basic EAP, JWS and Java templates using TLS edge replace passthrough TLS with edge TLS for ephemeral templates remove HTTP/S_NAME parameters from basic and ephemeral templates Signed-off-by: rcernich --- eap/eap64-amq-persistent-s2i.json | 4 +- eap/eap64-amq-s2i.json | 200 +---------------- eap/eap64-basic-s2i.json | 15 +- eap/eap64-https-s2i.json | 4 +- eap/eap64-mongodb-persistent-s2i.json | 4 +- eap/eap64-mongodb-s2i.json | 202 +----------------- eap/eap64-mysql-persistent-s2i.json | 4 +- eap/eap64-mysql-s2i.json | 202 +----------------- eap/eap64-postgresql-persistent-s2i.json | 4 +- eap/eap64-postgresql-s2i.json | 202 +----------------- eap/eap64-third-party-db-s2i.json | 4 +- eap/eap70-basic-s2i.json | 3 + eap/eap71-amq-persistent-s2i.json | 4 +- eap/eap71-amq-s2i.json | 200 +---------------- eap/eap71-basic-s2i.json | 15 +- eap/eap71-https-s2i.json | 4 +- eap/eap71-mongodb-persistent-s2i.json | 4 +- eap/eap71-mongodb-s2i.json | 202 +----------------- eap/eap71-mysql-persistent-s2i.json | 4 +- eap/eap71-mysql-s2i.json | 202 +----------------- eap/eap71-postgresql-persistent-s2i.json | 4 +- eap/eap71-postgresql-s2i.json | 202 +----------------- eap/eap71-third-party-db-s2i.json | 4 +- openjdk/openjdk18-web-basic-s2i.json | 11 +- webserver/jws31-tomcat7-basic-s2i.json | 18 +- webserver/jws31-tomcat7-https-s2i.json | 6 +- .../jws31-tomcat7-mongodb-persistent-s2i.json | 4 +- webserver/jws31-tomcat7-mongodb-s2i.json | 132 +----------- .../jws31-tomcat7-mysql-persistent-s2i.json | 4 +- webserver/jws31-tomcat7-mysql-s2i.json | 130 +---------- ...s31-tomcat7-postgresql-persistent-s2i.json | 4 +- webserver/jws31-tomcat7-postgresql-s2i.json | 132 +----------- webserver/jws31-tomcat8-basic-s2i.json | 13 +- webserver/jws31-tomcat8-https-s2i.json | 4 +- .../jws31-tomcat8-mongodb-persistent-s2i.json | 6 +- webserver/jws31-tomcat8-mongodb-s2i.json | 132 +----------- .../jws31-tomcat8-mysql-persistent-s2i.json | 4 +- webserver/jws31-tomcat8-mysql-s2i.json | 130 +---------- ...s31-tomcat8-postgresql-persistent-s2i.json | 7 +- webserver/jws31-tomcat8-postgresql-s2i.json | 134 +----------- 40 files changed, 128 insertions(+), 2436 deletions(-) diff --git a/eap/eap64-amq-persistent-s2i.json b/eap/eap64-amq-persistent-s2i.json index e1aded0d..cd0701e1 100644 --- a/eap/eap64-amq-persistent-s2i.json +++ b/eap/eap64-amq-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + A-MQ (with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + A-MQ (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 A-MQ application. 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ with persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ with persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap64-amq-s2i.json b/eap/eap64-amq-s2i.json index f320c9a1..3b0635f0 100644 --- a/eap/eap64-amq-s2i.json +++ b/eap/eap64-amq-s2i.json @@ -6,7 +6,7 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + A-MQ (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + A-MQ (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 A-MQ application. 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ and secure communication using https.", @@ -19,7 +19,7 @@ "template": "eap64-amq-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 6 and A-MQ based application with SSL support has been created in your project. The username/password for accessing the A-MQ service is ${MQ_USERNAME}/${MQ_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.", + "message": "A new EAP 6 and A-MQ based application has been created in your project. The username/password for accessing the A-MQ service is ${MQ_USERNAME}/${MQ_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -98,41 +84,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap-app-secret", - "required": false - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "A-MQ Username", "description": "User name for standard broker user. It is required for connecting to the broker. If left empty, it will be generated.", @@ -186,34 +137,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -275,31 +198,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's HTTPS port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-amq-tcp\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -390,32 +288,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's HTTPS service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -552,18 +429,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -594,11 +459,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -650,46 +510,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -700,20 +520,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap64-basic-s2i.json b/eap/eap64-basic-s2i.json index 8432a0ff..ab3a6e18 100644 --- a/eap/eap64-basic-s2i.json +++ b/eap/eap64-basic-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 (no https)", + "openshift.io/display-name": "JBoss EAP 6.4", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 application. 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration and insecure communication using http.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration and secure communication using https.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -28,13 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -201,9 +194,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "edge" } } }, diff --git a/eap/eap64-https-s2i.json b/eap/eap64-https-s2i.json index 36b53d5f..f4eb8805 100644 --- a/eap/eap64-https-s2i.json +++ b/eap/eap64-https-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 (with https)", + "openshift.io/display-name": "JBoss EAP 6.4 (Passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 application. 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap64-mongodb-persistent-s2i.json b/eap/eap64-mongodb-persistent-s2i.json index dcd88e9a..3a0ddf08 100644 --- a/eap/eap64-mongodb-persistent-s2i.json +++ b/eap/eap64-mongodb-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + MongoDB (with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + MongoDB (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 application with a MongoDB 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap64-mongodb-s2i.json b/eap/eap64-mongodb-s2i.json index c47c6eec..3326a222 100644 --- a/eap/eap64-mongodb-s2i.json +++ b/eap/eap64-mongodb-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + MongoDB (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + MongoDB (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 application with a MongoDB 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using ephemeral (temporary) storage and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using ephemeral (temporary) storage.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -19,7 +19,7 @@ "template": "eap64-mongodb-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 6 and MongoDB based application with SSL support has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_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.", + "message": "A new EAP 6 and MongoDB based application has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\").", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -91,41 +77,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -217,34 +168,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -313,31 +236,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mongodb\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -402,32 +300,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -564,18 +441,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -606,11 +471,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -666,26 +526,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, { "name": "HORNETQ_CLUSTER_PASSWORD", "value": "${HORNETQ_CLUSTER_PASSWORD}" @@ -698,26 +538,6 @@ "name": "HORNETQ_TOPICS", "value": "${HORNETQ_TOPICS}" }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -728,20 +548,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap64-mysql-persistent-s2i.json b/eap/eap64-mysql-persistent-s2i.json index 144d3a24..01e8d667 100644 --- a/eap/eap64-mysql-persistent-s2i.json +++ b/eap/eap64-mysql-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + MySQL (with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + MySQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 application with a MySQL 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap64-mysql-s2i.json b/eap/eap64-mysql-s2i.json index 83dd4a08..73212ce3 100644 --- a/eap/eap64-mysql-s2i.json +++ b/eap/eap64-mysql-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + MySQL (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + MySQL (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 application with a MySQL 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using ephemeral (temporary) storage and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using ephemeral (temporary) storage.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -19,7 +19,7 @@ "template": "eap64-mysql-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 6 and MySQL based application with SSL support has been created in your project. The username/password for accessing the MySQL 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.", + "message": "A new EAP 6 and MySQL based application has been created in your project. The username/password for accessing the MySQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -91,41 +77,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -221,34 +172,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -317,31 +240,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -406,32 +304,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -568,18 +445,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -610,11 +475,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -670,26 +530,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, { "name": "HORNETQ_CLUSTER_PASSWORD", "value": "${HORNETQ_CLUSTER_PASSWORD}" @@ -702,26 +542,6 @@ "name": "HORNETQ_TOPICS", "value": "${HORNETQ_TOPICS}" }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -736,20 +556,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap64-postgresql-persistent-s2i.json b/eap/eap64-postgresql-persistent-s2i.json index 8bcf20c5..35780337 100644 --- a/eap/eap64-postgresql-persistent-s2i.json +++ b/eap/eap64-postgresql-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "Red Hat JBoss EAP 6.4 + PostgreSQL (Persistent with https)", + "openshift.io/display-name": "Red Hat JBoss EAP 6.4 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap64-postgresql-s2i.json b/eap/eap64-postgresql-s2i.json index 19be8483..b88f576e 100644 --- a/eap/eap64-postgresql-s2i.json +++ b/eap/eap64-postgresql-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 6.4 + PostgreSQL (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 6.4 + PostgreSQL (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using ephemeral (temporary) storage and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using ephemeral (temporary) storage.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -19,7 +19,7 @@ "template": "eap64-postgresql-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 6 and PostgreSQL based application with SSL support has been created in your project. 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.", + "message": "A new EAP 6 and PostgreSQL based application has been created in your project. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -91,41 +77,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -203,34 +154,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -299,31 +222,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -388,32 +286,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -550,18 +427,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -592,11 +457,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -652,26 +512,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, { "name": "HORNETQ_CLUSTER_PASSWORD", "value": "${HORNETQ_CLUSTER_PASSWORD}" @@ -684,26 +524,6 @@ "name": "HORNETQ_TOPICS", "value": "${HORNETQ_TOPICS}" }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -718,20 +538,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap64-third-party-db-s2i.json b/eap/eap64-third-party-db-s2i.json index d9b7687d..e2bfdcce 100644 --- a/eap/eap64-third-party-db-s2i.json +++ b/eap/eap64-third-party-db-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "Red Hat JBoss EAP 6.4 (with https, DB drivers)", + "openshift.io/display-name": "Red Hat JBoss EAP 6.4 (Passthrough TLS, DB drivers)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 6 DB application. 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 Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 6.4 based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap70-basic-s2i.json b/eap/eap70-basic-s2i.json index fe88d792..110618aa 100644 --- a/eap/eap70-basic-s2i.json +++ b/eap/eap70-basic-s2i.json @@ -204,6 +204,9 @@ "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "edge" } } }, diff --git a/eap/eap71-amq-persistent-s2i.json b/eap/eap71-amq-persistent-s2i.json index 007fae34..92787126 100644 --- a/eap/eap71-amq-persistent-s2i.json +++ b/eap/eap71-amq-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + A-MQ (with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + A-MQ (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 A-MQ application. 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ with persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ with persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap71-amq-s2i.json b/eap/eap71-amq-s2i.json index c174bc4c..865ab842 100644 --- a/eap/eap71-amq-s2i.json +++ b/eap/eap71-amq-s2i.json @@ -6,7 +6,7 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + A-MQ (with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + A-MQ (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 A-MQ application. 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, using Red Hat JBoss A-MQ and secure communication using https.", @@ -19,7 +19,7 @@ "template": "eap71-amq-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 7 and A-MQ based application with SSL support has been created in your project. The username/password for accessing the A-MQ service is ${MQ_USERNAME}/${MQ_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.", + "message": "A new EAP 7 and A-MQ based application has been created in your project. The username/password for accessing the A-MQ service is ${MQ_USERNAME}/${MQ_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -98,41 +84,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap7-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "A-MQ Username", "description": "User name for standard broker user. It is required for connecting to the broker. If left empty, it will be generated.", @@ -186,34 +137,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap7-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -282,31 +205,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's HTTPS port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-amq-tcp\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -397,32 +295,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's HTTPS service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -563,18 +440,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -605,11 +470,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -661,46 +521,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -711,20 +531,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap71-basic-s2i.json b/eap/eap71-basic-s2i.json index e67a597c..839015b7 100644 --- a/eap/eap71-basic-s2i.json +++ b/eap/eap71-basic-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 (no https)", + "openshift.io/display-name": "JBoss EAP 7.1", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 application. 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration and insecure communication using http.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration and secure communication using https.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -28,13 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -208,9 +201,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "edge" } } }, diff --git a/eap/eap71-https-s2i.json b/eap/eap71-https-s2i.json index 43360dca..d684e167 100644 --- a/eap/eap71-https-s2i.json +++ b/eap/eap71-https-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 (with https)", + "openshift.io/display-name": "JBoss EAP 7.1 (Passthrough TLS)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 application. 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap71-mongodb-persistent-s2i.json b/eap/eap71-mongodb-persistent-s2i.json index 65fc3b88..e719b7d8 100644 --- a/eap/eap71-mongodb-persistent-s2i.json +++ b/eap/eap71-mongodb-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + MongoDB (with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + MongoDB (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 application with a MongoDB 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap71-mongodb-s2i.json b/eap/eap71-mongodb-s2i.json index a3509d3a..b8ef8d48 100644 --- a/eap/eap71-mongodb-s2i.json +++ b/eap/eap71-mongodb-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + MongoDB (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + MongoDB (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 application with a MongoDB 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using ephemeral (temporary) storage and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using ephemeral (temporary) storage.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -19,7 +19,7 @@ "template": "eap71-mongodb-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 7 and MongoDB based application with SSL support has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_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.", + "message": "A new EAP 7 and MongoDB based application has been created in your project. The username/password for accessing the MongoDB database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\").", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -91,41 +77,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap7-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -217,34 +168,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap7-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -320,31 +243,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mongodb\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -409,32 +307,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -575,18 +452,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -617,11 +482,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -677,26 +537,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, { "name": "MQ_CLUSTER_PASSWORD", "value": "${MQ_CLUSTER_PASSWORD}" @@ -709,26 +549,6 @@ "name": "MQ_TOPICS", "value": "${MQ_TOPICS}" }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -739,20 +559,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap71-mysql-persistent-s2i.json b/eap/eap71-mysql-persistent-s2i.json index e710b238..43849859 100644 --- a/eap/eap71-mysql-persistent-s2i.json +++ b/eap/eap71-mysql-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + MySQL (with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + MySQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 application with a MySQL 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap71-mysql-s2i.json b/eap/eap71-mysql-s2i.json index 8d34970d..3dea1980 100644 --- a/eap/eap71-mysql-s2i.json +++ b/eap/eap71-mysql-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + MySQL (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + MySQL (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 application with a MySQL 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using ephemeral (temporary) storage and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using ephemeral (temporary) storage.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -19,7 +19,7 @@ "template": "eap71-mysql-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 7 and MySQL based application with SSL support has been created in your project. The username/password for accessing the MySQL 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.", + "message": "A new EAP 7 and MySQL based application has been created in your project. The username/password for accessing the MySQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -91,41 +77,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap7-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -221,34 +172,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap7-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -324,31 +247,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -413,32 +311,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -579,18 +456,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -621,11 +486,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -681,26 +541,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, { "name": "MQ_CLUSTER_PASSWORD", "value": "${MQ_CLUSTER_PASSWORD}" @@ -713,26 +553,6 @@ "name": "MQ_TOPICS", "value": "${MQ_TOPICS}" }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -751,20 +571,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap71-postgresql-persistent-s2i.json b/eap/eap71-postgresql-persistent-s2i.json index 07a7c150..b18c372d 100644 --- a/eap/eap71-postgresql-persistent-s2i.json +++ b/eap/eap71-postgresql-persistent-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + PostgreSQL (Persistent with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + PostgreSQL (Persistent)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/eap/eap71-postgresql-s2i.json b/eap/eap71-postgresql-s2i.json index 866235fd..333044ea 100644 --- a/eap/eap71-postgresql-s2i.json +++ b/eap/eap71-postgresql-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 + PostgreSQL (Ephemeral with https)", + "openshift.io/display-name": "JBoss EAP 7.1 + PostgreSQL (Ephemeral)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using ephemeral (temporary) storage and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using ephemeral (temporary) storage.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, @@ -19,7 +19,7 @@ "template": "eap71-postgresql-s2i", "xpaas": "1.4.14" }, - "message": "A new EAP 7 and PostgreSQL based application with SSL support has been created in your project. 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.", + "message": "A new EAP 7 and PostgreSQL based application has been created in your project. The username/password for accessing the PostgreSQL database \"${DB_DATABASE}\" is ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -28,20 +28,6 @@ "value": "eap-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -91,41 +77,6 @@ "value": "", "required": false }, - { - "displayName": "Server Keystore Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "HTTPS_SECRET", - "value": "eap7-app-secret", - "required": true - }, - { - "displayName": "Server Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "HTTPS_KEYSTORE", - "value": "keystore.jks", - "required": false - }, - { - "displayName": "Server Keystore Type", - "description": "The type of the keystore file (JKS or JCEKS)", - "name": "HTTPS_KEYSTORE_TYPE", - "value": "", - "required": false - }, - { - "displayName": "Server Certificate Name", - "description": "The name associated with the server certificate", - "name": "HTTPS_NAME", - "value": "", - "required": false - }, - { - "displayName": "Server Keystore Password", - "description": "The password for the keystore and certificate", - "name": "HTTPS_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -203,34 +154,6 @@ "value": "openshift", "required": true }, - { - "displayName": "JGroups Secret Name", - "description": "The name of the secret containing the keystore file", - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "eap7-app-secret", - "required": false - }, - { - "displayName": "JGroups Keystore Filename", - "description": "The name of the keystore file within the secret", - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "jgroups.jceks", - "required": false - }, - { - "displayName": "JGroups Certificate Name", - "description": "The name associated with the server certificate", - "name": "JGROUPS_ENCRYPT_NAME", - "value": "", - "required": false - }, - { - "displayName": "JGroups Keystore Password", - "description": "The password for the keystore and certificate", - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "", - "required": false - }, { "displayName": "JGroups Cluster Password", "description": "JGroups cluster password", @@ -306,31 +229,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -395,32 +293,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -561,18 +438,6 @@ "memory": "${MEMORY_LIMIT}" } }, - "volumeMounts": [ - { - "name": "eap-keystore-volume", - "mountPath": "/etc/eap-secret-volume", - "readOnly": true - }, - { - "name": "eap-jgroups-keystore-volume", - "mountPath": "/etc/jgroups-encrypt-secret-volume", - "readOnly": true - } - ], "livenessProbe": { "exec": { "command": [ @@ -603,11 +468,6 @@ "containerPort": 8080, "protocol": "TCP" }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" - }, { "name": "ping", "containerPort": 8888, @@ -663,26 +523,6 @@ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT", "value": "8888" }, - { - "name": "HTTPS_KEYSTORE_DIR", - "value": "/etc/eap-secret-volume" - }, - { - "name": "HTTPS_KEYSTORE", - "value": "${HTTPS_KEYSTORE}" - }, - { - "name": "HTTPS_KEYSTORE_TYPE", - "value": "${HTTPS_KEYSTORE_TYPE}" - }, - { - "name": "HTTPS_NAME", - "value": "${HTTPS_NAME}" - }, - { - "name": "HTTPS_PASSWORD", - "value": "${HTTPS_PASSWORD}" - }, { "name": "MQ_CLUSTER_PASSWORD", "value": "${MQ_CLUSTER_PASSWORD}" @@ -695,26 +535,6 @@ "name": "MQ_TOPICS", "value": "${MQ_TOPICS}" }, - { - "name": "JGROUPS_ENCRYPT_SECRET", - "value": "${JGROUPS_ENCRYPT_SECRET}" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE_DIR", - "value": "/etc/jgroups-encrypt-secret-volume" - }, - { - "name": "JGROUPS_ENCRYPT_KEYSTORE", - "value": "${JGROUPS_ENCRYPT_KEYSTORE}" - }, - { - "name": "JGROUPS_ENCRYPT_NAME", - "value": "${JGROUPS_ENCRYPT_NAME}" - }, - { - "name": "JGROUPS_ENCRYPT_PASSWORD", - "value": "${JGROUPS_ENCRYPT_PASSWORD}" - }, { "name": "JGROUPS_CLUSTER_PASSWORD", "value": "${JGROUPS_CLUSTER_PASSWORD}" @@ -733,20 +553,6 @@ } ] } - ], - "volumes": [ - { - "name": "eap-keystore-volume", - "secret": { - "secretName": "${HTTPS_SECRET}" - } - }, - { - "name": "eap-jgroups-keystore-volume", - "secret": { - "secretName": "${JGROUPS_ENCRYPT_SECRET}" - } - } ] } } diff --git a/eap/eap71-third-party-db-s2i.json b/eap/eap71-third-party-db-s2i.json index 0bbd89e0..c2a316c4 100644 --- a/eap/eap71-third-party-db-s2i.json +++ b/eap/eap71-third-party-db-s2i.json @@ -6,10 +6,10 @@ "iconClass": "icon-eap", "tags": "eap,javaee,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss EAP 7.1 (with https, DB drivers)", + "openshift.io/display-name": "JBoss EAP 7.1 (Passthrough TLS, DB drivers)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "An example EAP 7 DB application. 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 Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat Enterprise Application Server 7.1 based application, including a build configuration, application deployment configuration, using third-party DB drivers and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-enterprise-application-platform/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/openjdk/openjdk18-web-basic-s2i.json b/openjdk/openjdk18-web-basic-s2i.json index 21023df3..65f5cff4 100644 --- a/openjdk/openjdk18-web-basic-s2i.json +++ b/openjdk/openjdk18-web-basic-s2i.json @@ -28,13 +28,6 @@ "value": "openjdk-app", "required": true }, - { - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "displayName": "Custom http Route Hostname", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, { "description": "Git source URI for application", "displayName": "Git Repository URL", @@ -119,9 +112,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "edge" } } }, diff --git a/webserver/jws31-tomcat7-basic-s2i.json b/webserver/jws31-tomcat7-basic-s2i.json index c6f197f4..d8030925 100644 --- a/webserver/jws31-tomcat7-basic-s2i.json +++ b/webserver/jws31-tomcat7-basic-s2i.json @@ -5,10 +5,13 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Application template for JWS applications built using S2I.", "tags": "tomcat,tomcat7,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 (no https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7", + "description": "An example JBoss Web Server application. 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 JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, and an application deployment configuration.", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", + "template.openshift.io/support-url": "https://access.redhat.com" }, "name": "jws31-tomcat7-basic-s2i" }, @@ -25,13 +28,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -145,9 +141,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "edge" } } }, diff --git a/webserver/jws31-tomcat7-https-s2i.json b/webserver/jws31-tomcat7-https-s2i.json index 4c305896..5e61747a 100644 --- a/webserver/jws31-tomcat7-https-s2i.json +++ b/webserver/jws31-tomcat7-https-s2i.json @@ -5,11 +5,11 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "An example JBoss Web Server application configured for use with https. For more information about using this template, see https://github.com/jboss-openshift/application-templates.", "tags": "tomcat,tomcat7,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 (with https)", - "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, and application deployment configuration. This also illustrations how to connect to the web applicaiton using https.", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 (Passthrough TLS)", + "description": "An example JBoss Web Server application. 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 JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" diff --git a/webserver/jws31-tomcat7-mongodb-persistent-s2i.json b/webserver/jws31-tomcat7-mongodb-persistent-s2i.json index 49b68456..25e1424f 100644 --- a/webserver/jws31-tomcat7-mongodb-persistent-s2i.json +++ b/webserver/jws31-tomcat7-mongodb-persistent-s2i.json @@ -7,9 +7,9 @@ "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat7,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MongoDB (with https)", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MongoDB (Persistent)", "description": "An example JBoss Web Server application with a MongoDB 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 JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/webserver/jws31-tomcat7-mongodb-s2i.json b/webserver/jws31-tomcat7-mongodb-s2i.json index 3990b363..bd0b2ea6 100644 --- a/webserver/jws31-tomcat7-mongodb-s2i.json +++ b/webserver/jws31-tomcat7-mongodb-s2i.json @@ -5,10 +5,10 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Application template for JWS MongoDB applications built using S2I.", "tags": "tomcat,tomcat7,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MongoDB (Ephemeral with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MongoDB (Ephemeral)", + "description": "Application template for JWS MongoDB applications built using S2I." }, "name": "jws31-tomcat7-mongodb-s2i" }, @@ -16,7 +16,7 @@ "template": "jws31-tomcat7-mongodb-s2i", "xpaas": "1.4.14" }, - "message": "A new JWS application for Apache Tomcat 7 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 7 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\").", "parameters": [ { "displayName": "Application Name", @@ -25,20 +25,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -74,34 +60,6 @@ "value": "root", "required": true }, - { - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "name": "JWS_HTTPS_SECRET", - "value": "jws-app-secret", - "required": true - }, - { - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "name": "JWS_HTTPS_CERTIFICATE", - "value": "server.crt", - "required": false - }, - { - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "server.key", - "required": false - }, - { - "displayName": "Certificate Password", - "description": "The certificate password", - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -248,31 +206,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mongodb\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -311,32 +244,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -477,13 +389,6 @@ ] } }, - "volumeMounts": [ - { - "name": "jws-certificate-volume", - "mountPath": "/etc/jws-secret-volume", - "readOnly": true - } - ], "ports": [ { "name": "jolokia", @@ -494,11 +399,6 @@ "name": "http", "containerPort": 8080, "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" } ], "env": [ @@ -538,22 +438,6 @@ "name": "DB_TX_ISOLATION", "value": "${DB_TX_ISOLATION}" }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, { "name": "JWS_ADMIN_USERNAME", "value": "${JWS_ADMIN_USERNAME}" @@ -564,14 +448,6 @@ } ] } - ], - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } ] } } diff --git a/webserver/jws31-tomcat7-mysql-persistent-s2i.json b/webserver/jws31-tomcat7-mysql-persistent-s2i.json index c9247787..52649117 100644 --- a/webserver/jws31-tomcat7-mysql-persistent-s2i.json +++ b/webserver/jws31-tomcat7-mysql-persistent-s2i.json @@ -7,9 +7,9 @@ "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat7,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 7 + MySQL (with https)", + "openshift.io/display-name": "Red Hat JBoss Web Server 3.1 Apache Tomcat 7 + MySQL (Persistent)", "description": "An example JBoss Web Server application with a MySQL 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 JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" diff --git a/webserver/jws31-tomcat7-mysql-s2i.json b/webserver/jws31-tomcat7-mysql-s2i.json index 45037349..9bc0161d 100644 --- a/webserver/jws31-tomcat7-mysql-s2i.json +++ b/webserver/jws31-tomcat7-mysql-s2i.json @@ -8,7 +8,7 @@ "description": "Application template for JWS MySQL applications built using S2I.", "tags": "tomcat,tomcat7,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MySQL (Ephemeral with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + MySQL (Ephemeral)" }, "name": "jws31-tomcat7-mysql-s2i" }, @@ -16,7 +16,7 @@ "template": "jws31-tomcat7-mysql-s2i", "xpaas": "1.4.14" }, - "message": "A new JWS application for Apache Tomcat 7 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 7 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -25,20 +25,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -74,34 +60,6 @@ "value": "root", "required": true }, - { - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "name": "JWS_HTTPS_SECRET", - "value": "jws-app-secret", - "required": true - }, - { - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "name": "JWS_HTTPS_CERTIFICATE", - "value": "server.crt", - "required": false - }, - { - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "server.key", - "required": false - }, - { - "displayName": "Certificate Password", - "description": "The certificate password", - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -252,31 +210,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -315,32 +248,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -481,13 +393,6 @@ ] } }, - "volumeMounts": [ - { - "name": "jws-certificate-volume", - "mountPath": "/etc/jws-secret-volume", - "readOnly": true - } - ], "ports": [ { "name": "jolokia", @@ -498,11 +403,6 @@ "name": "http", "containerPort": 8080, "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" } ], "env": [ @@ -538,22 +438,6 @@ "name": "DB_TX_ISOLATION", "value": "${DB_TX_ISOLATION}" }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, { "name": "JWS_ADMIN_USERNAME", "value": "${JWS_ADMIN_USERNAME}" @@ -564,14 +448,6 @@ } ] } - ], - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } ] } } diff --git a/webserver/jws31-tomcat7-postgresql-persistent-s2i.json b/webserver/jws31-tomcat7-postgresql-persistent-s2i.json index 2379acb2..57685cf1 100644 --- a/webserver/jws31-tomcat7-postgresql-persistent-s2i.json +++ b/webserver/jws31-tomcat7-postgresql-persistent-s2i.json @@ -7,9 +7,9 @@ "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat7,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + PostgreSQL (with https)", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + PostgreSQL (Persistent)", "description": "An example JBoss Web Server 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 JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 7 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/webserver/jws31-tomcat7-postgresql-s2i.json b/webserver/jws31-tomcat7-postgresql-s2i.json index b2afb5c4..3a929c7c 100644 --- a/webserver/jws31-tomcat7-postgresql-s2i.json +++ b/webserver/jws31-tomcat7-postgresql-s2i.json @@ -5,10 +5,10 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Application template for JWS PostgreSQL applications built using S2I.", "tags": "tomcat,tomcat7,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + PostgreSQL (Ephemeral with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 7 + PostgreSQL (Ephemeral)", + "description": "Application template for JWS PostgreSQL applications built using S2I." }, "name": "jws31-tomcat7-postgresql-s2i" }, @@ -16,7 +16,7 @@ "template": "jws31-tomcat7-postgresql-s2i", "xpaas": "1.4.14" }, - "message": "A new JWS application for Apache Tomcat 7 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 7 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -25,20 +25,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -74,34 +60,6 @@ "value": "root", "required": true }, - { - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "name": "JWS_HTTPS_SECRET", - "value": "jws-app-secret", - "required": true - }, - { - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "name": "JWS_HTTPS_CERTIFICATE", - "value": "server.crt", - "required": false - }, - { - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "server.key", - "required": false - }, - { - "displayName": "Certificate Password", - "description": "The certificate password", - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -234,31 +192,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -297,32 +230,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -463,13 +375,6 @@ ] } }, - "volumeMounts": [ - { - "name": "jws-certificate-volume", - "mountPath": "/etc/jws-secret-volume", - "readOnly": true - } - ], "ports": [ { "name": "jolokia", @@ -480,11 +385,6 @@ "name": "http", "containerPort": 8080, "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" } ], "env": [ @@ -520,22 +420,6 @@ "name": "DB_TX_ISOLATION", "value": "${DB_TX_ISOLATION}" }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, { "name": "JWS_ADMIN_USERNAME", "value": "${JWS_ADMIN_USERNAME}" @@ -546,14 +430,6 @@ } ] } - ], - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } ] } } diff --git a/webserver/jws31-tomcat8-basic-s2i.json b/webserver/jws31-tomcat8-basic-s2i.json index 826a5e4e..784331d3 100644 --- a/webserver/jws31-tomcat8-basic-s2i.json +++ b/webserver/jws31-tomcat8-basic-s2i.json @@ -7,7 +7,7 @@ "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat8,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 (no https)", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8", "description": "An example JBoss Web Server application. 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 JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, and an application deployment configuration.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", @@ -28,13 +28,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -148,9 +141,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" + }, + "tls": { + "termination": "edge" } } }, diff --git a/webserver/jws31-tomcat8-https-s2i.json b/webserver/jws31-tomcat8-https-s2i.json index c4323b49..40675f38 100644 --- a/webserver/jws31-tomcat8-https-s2i.json +++ b/webserver/jws31-tomcat8-https-s2i.json @@ -7,9 +7,9 @@ "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat8,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 (with https)", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 (Passthrough TLS)", "description": "An example JBoss Web Server application. 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 JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" diff --git a/webserver/jws31-tomcat8-mongodb-persistent-s2i.json b/webserver/jws31-tomcat8-mongodb-persistent-s2i.json index 47b130c4..e504cc8d 100644 --- a/webserver/jws31-tomcat8-mongodb-persistent-s2i.json +++ b/webserver/jws31-tomcat8-mongodb-persistent-s2i.json @@ -7,9 +7,11 @@ "version": "1.4.14", "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MongoDB (with https)", + "tags": "tomcat,tomcat8,java,jboss", + "version": "1.4.10", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MongoDB (Persistent)", "description": "An example JBoss Web Server application with a MongoDB 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 JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for MongoDB using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" diff --git a/webserver/jws31-tomcat8-mongodb-s2i.json b/webserver/jws31-tomcat8-mongodb-s2i.json index 615d5c4b..0c98078a 100644 --- a/webserver/jws31-tomcat8-mongodb-s2i.json +++ b/webserver/jws31-tomcat8-mongodb-s2i.json @@ -5,10 +5,10 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Application template for JWS MongoDB applications built using S2I.", "tags": "tomcat,tomcat8,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MongoDB (Ephemeral with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MongoDB (Ephemeral)", + "description": "Application template for JWS MongoDB applications built using S2I." }, "name": "jws31-tomcat8-mongodb-s2i" }, @@ -16,7 +16,7 @@ "template": "jws31-tomcat8-mongodb-s2i", "xpaas": "1.4.14" }, - "message": "A new JWS application for Apache Tomcat 8 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\"). Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 8 (using MongoDB) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MongoDB database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD} (Admin password is \"${DB_ADMIN_PASSWORD}\").", "parameters": [ { "displayName": "Application Name", @@ -25,20 +25,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -74,34 +60,6 @@ "value": "root", "required": true }, - { - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "name": "JWS_HTTPS_SECRET", - "value": "jws-app-secret", - "required": true - }, - { - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "name": "JWS_HTTPS_CERTIFICATE", - "value": "server.crt", - "required": false - }, - { - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "server.key", - "required": false - }, - { - "displayName": "Certificate Password", - "description": "The certificate password", - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -248,31 +206,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mongodb\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -311,32 +244,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -477,13 +389,6 @@ ] } }, - "volumeMounts": [ - { - "name": "jws-certificate-volume", - "mountPath": "/etc/jws-secret-volume", - "readOnly": true - } - ], "ports": [ { "name": "jolokia", @@ -494,11 +399,6 @@ "name": "http", "containerPort": 8080, "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" } ], "env": [ @@ -538,22 +438,6 @@ "name": "DB_TX_ISOLATION", "value": "${DB_TX_ISOLATION}" }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, { "name": "JWS_ADMIN_USERNAME", "value": "${JWS_ADMIN_USERNAME}" @@ -564,14 +448,6 @@ } ] } - ], - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } ] } } diff --git a/webserver/jws31-tomcat8-mysql-persistent-s2i.json b/webserver/jws31-tomcat8-mysql-persistent-s2i.json index d4bbc98b..51ecfde3 100644 --- a/webserver/jws31-tomcat8-mysql-persistent-s2i.json +++ b/webserver/jws31-tomcat8-mysql-persistent-s2i.json @@ -7,9 +7,9 @@ "openshift.io/provider-display-name": "Red Hat, Inc.", "tags": "tomcat,tomcat8,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MySQL (with https)", + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MySQL (Persistent)", "description": "An example JBoss Web Server application with a MySQL 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 JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using https.", + "template.openshift.io/long-description": "This template defines resources needed to develop Red Hat JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for MySQL using persistence and secure communication using passthrough TLS.", "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", "template.openshift.io/support-url": "https://access.redhat.com" }, diff --git a/webserver/jws31-tomcat8-mysql-s2i.json b/webserver/jws31-tomcat8-mysql-s2i.json index 75c20251..900a24ea 100644 --- a/webserver/jws31-tomcat8-mysql-s2i.json +++ b/webserver/jws31-tomcat8-mysql-s2i.json @@ -8,7 +8,7 @@ "description": "Application template for JWS MySQL applications built using S2I.", "tags": "tomcat,tomcat8,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MySQL (Ephemeral with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + MySQL (Ephemeral)" }, "name": "jws31-tomcat8-mysql-s2i" }, @@ -16,7 +16,7 @@ "template": "jws31-tomcat8-mysql-s2i", "xpaas": "1.4.14" }, - "message": "A new JWS application for Apache Tomcat 8 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 8 (using MySQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the MySQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -25,20 +25,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -74,34 +60,6 @@ "value": "root", "required": true }, - { - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "name": "JWS_HTTPS_SECRET", - "value": "jws-app-secret", - "required": true - }, - { - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "name": "JWS_HTTPS_CERTIFICATE", - "value": "server.crt", - "required": false - }, - { - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "server.key", - "required": false - }, - { - "displayName": "Certificate Password", - "description": "The certificate password", - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -252,31 +210,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-mysql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -315,32 +248,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -481,13 +393,6 @@ ] } }, - "volumeMounts": [ - { - "name": "jws-certificate-volume", - "mountPath": "/etc/jws-secret-volume", - "readOnly": true - } - ], "ports": [ { "name": "jolokia", @@ -498,11 +403,6 @@ "name": "http", "containerPort": 8080, "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" } ], "env": [ @@ -538,22 +438,6 @@ "name": "DB_TX_ISOLATION", "value": "${DB_TX_ISOLATION}" }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, { "name": "JWS_ADMIN_USERNAME", "value": "${JWS_ADMIN_USERNAME}" @@ -564,14 +448,6 @@ } ] } - ], - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } ] } } diff --git a/webserver/jws31-tomcat8-postgresql-persistent-s2i.json b/webserver/jws31-tomcat8-postgresql-persistent-s2i.json index 257d3060..56d620fa 100644 --- a/webserver/jws31-tomcat8-postgresql-persistent-s2i.json +++ b/webserver/jws31-tomcat8-postgresql-persistent-s2i.json @@ -5,10 +5,13 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Application template for JWS PostgreSQL applications with persistent storage built using S2I.", "tags": "tomcat,tomcat8,java,jboss", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + PostgreSQL (with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + PostgreSQL (Persistent)", + "description": "An example JBoss Web Server 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 JBoss Web Server 3.1 Apache Tomcat 8 based application, including a build configuration, application deployment configuration, database deployment configuration for PostgreSQL using persistence and secure communication using passthrough TLS.", + "template.openshift.io/documentation-url": "https://access.redhat.com/documentation/en/red-hat-jboss-web-server/", + "template.openshift.io/support-url": "https://access.redhat.com" }, "name": "jws31-tomcat8-postgresql-persistent-s2i" }, diff --git a/webserver/jws31-tomcat8-postgresql-s2i.json b/webserver/jws31-tomcat8-postgresql-s2i.json index 3b412e98..a4f13a04 100644 --- a/webserver/jws31-tomcat8-postgresql-s2i.json +++ b/webserver/jws31-tomcat8-postgresql-s2i.json @@ -5,10 +5,10 @@ "annotations": { "iconClass": "icon-rh-tomcat", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Application template for JWS PostgreSQL applications built using S2I.", "tags": "tomcat,tomcat8,java,jboss,hidden", "version": "1.4.14", - "openshift.io/display-name": "JBoss Web Server 3.0 Apache Tomcat 8 + PostgreSQL (Ephemeral with https)" + "openshift.io/display-name": "JBoss Web Server 3.1 Apache Tomcat 8 + PostgreSQL (Ephemeral)", + "description": "Application template for JWS PostgreSQL applications built using S2I." }, "name": "jws31-tomcat8-postgresql-s2i" }, @@ -16,7 +16,7 @@ "template": "jws31-tomcat8-postgresql-s2i", "xpaas": "1.4.14" }, - "message": "A new JWS application for Apache Tomcat 8 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}. Please be sure to create the secret named \"${JWS_HTTPS_SECRET}\" containing the ${JWS_HTTPS_CERTIFICATE} file used for serving secure content.", + "message": "A new JWS application for Apache Tomcat 8 (using PostgreSQL) has been created in your project. The username/password for administering your JWS is ${JWS_ADMIN_USERNAME}/${JWS_ADMIN_PASSWORD}. For accessing the PostgreSQL database \"${DB_DATABASE}\" use the credentials ${DB_USERNAME}/${DB_PASSWORD}.", "parameters": [ { "displayName": "Application Name", @@ -25,20 +25,6 @@ "value": "jws-app", "required": true }, - { - "displayName": "Custom http Route Hostname", - "description": "Custom hostname for http service route. Leave blank for default hostname, e.g.: -.", - "name": "HOSTNAME_HTTP", - "value": "", - "required": false - }, - { - "displayName": "Custom https Route Hostname", - "description": "Custom hostname for https service route. Leave blank for default hostname, e.g.: secure--.", - "name": "HOSTNAME_HTTPS", - "value": "", - "required": false - }, { "displayName": "Git Repository URL", "description": "Git source URI for application", @@ -74,34 +60,6 @@ "value": "root", "required": true }, - { - "displayName": "Secret Name", - "description": "The name of the secret containing the certificate files", - "name": "JWS_HTTPS_SECRET", - "value": "jws-app-secret", - "required": true - }, - { - "displayName": "Certificate Name", - "description": "The name of the certificate file within the secret", - "name": "JWS_HTTPS_CERTIFICATE", - "value": "server.crt", - "required": false - }, - { - "displayName": "Certificate Key Name", - "description": "The name of the certificate key file within the secret", - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "server.key", - "required": false - }, - { - "displayName": "Certificate Password", - "description": "The certificate password", - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "", - "required": false - }, { "displayName": "Datasource Minimum Pool Size", "description": "Sets xa-pool/min-pool-size for the configured datasource.", @@ -234,31 +192,6 @@ } } }, - { - "kind": "Service", - "apiVersion": "v1", - "spec": { - "ports": [ - { - "port": 8443, - "targetPort": 8443 - } - ], - "selector": { - "deploymentConfig": "${APPLICATION_NAME}" - } - }, - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "The web server's https port.", - "service.alpha.openshift.io/dependencies": "[{\"name\": \"${APPLICATION_NAME}-postgresql\", \"kind\": \"Service\"}]" - } - } - }, { "kind": "Service", "apiVersion": "v1", @@ -297,32 +230,11 @@ } }, "spec": { - "host": "${HOSTNAME_HTTP}", "to": { "name": "${APPLICATION_NAME}" - } - } - }, - { - "kind": "Route", - "apiVersion": "v1", - "id": "${APPLICATION_NAME}-https", - "metadata": { - "name": "secure-${APPLICATION_NAME}", - "labels": { - "application": "${APPLICATION_NAME}" - }, - "annotations": { - "description": "Route for application's https service." - } - }, - "spec": { - "host": "${HOSTNAME_HTTPS}", - "to": { - "name": "secure-${APPLICATION_NAME}" }, "tls": { - "termination": "passthrough" + "termination": "edge" } } }, @@ -448,6 +360,7 @@ } }, "spec": { + "terminationGracePeriodSeconds": 60, "containers": [ { "name": "${APPLICATION_NAME}", @@ -462,13 +375,6 @@ ] } }, - "volumeMounts": [ - { - "name": "jws-certificate-volume", - "mountPath": "/etc/jws-secret-volume", - "readOnly": true - } - ], "ports": [ { "name": "jolokia", @@ -479,11 +385,6 @@ "name": "http", "containerPort": 8080, "protocol": "TCP" - }, - { - "name": "https", - "containerPort": 8443, - "protocol": "TCP" } ], "env": [ @@ -519,22 +420,6 @@ "name": "DB_TX_ISOLATION", "value": "${DB_TX_ISOLATION}" }, - { - "name": "JWS_HTTPS_CERTIFICATE_DIR", - "value": "/etc/jws-secret-volume" - }, - { - "name": "JWS_HTTPS_CERTIFICATE", - "value": "${JWS_HTTPS_CERTIFICATE}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_KEY", - "value": "${JWS_HTTPS_CERTIFICATE_KEY}" - }, - { - "name": "JWS_HTTPS_CERTIFICATE_PASSWORD", - "value": "${JWS_HTTPS_CERTIFICATE_PASSWORD}" - }, { "name": "JWS_ADMIN_USERNAME", "value": "${JWS_ADMIN_USERNAME}" @@ -545,14 +430,6 @@ } ] } - ], - "volumes": [ - { - "name": "jws-certificate-volume", - "secret": { - "secretName": "${JWS_HTTPS_SECRET}" - } - } ] } } @@ -603,6 +480,7 @@ } }, "spec": { + "terminationGracePeriodSeconds": 60, "containers": [ { "name": "${APPLICATION_NAME}-postgresql",