summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json')
-rw-r--r--roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json86
1 files changed, 65 insertions, 21 deletions
diff --git a/roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json b/roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json
index 66b0c737d..bf7c6cf89 100644
--- a/roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json
+++ b/roles/openshift_examples/files/examples/v3.7/xpaas-templates/eap70-postgresql-s2i.json
@@ -5,7 +5,7 @@
"annotations": {
"iconClass": "icon-eap",
"tags": "eap,javaee,java,jboss,hidden",
- "version": "1.4.7",
+ "version": "1.4.8",
"openshift.io/display-name": "JBoss EAP 7.0 + PostgreSQL (Ephemeral with https)",
"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.",
@@ -17,9 +17,9 @@
},
"labels": {
"template": "eap70-postgresql-s2i",
- "xpaas": "1.4.7"
+ "xpaas": "1.4.8"
},
- "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 \"${SERVICE_ACCOUNT_NAME}\" service account and 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 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.",
"parameters": [
{
"displayName": "Application Name",
@@ -92,13 +92,6 @@
"required": false
},
{
- "displayName": "Service Account Name",
- "description": "The name of the service account to use for the deployment. The service account should be configured to allow useage of the secret(s) specified by HTTPS_SECRET and JGROUPS_ENCRYPT_SECRET.",
- "name": "SERVICE_ACCOUNT_NAME",
- "value": "eap7-service-account",
- "required": true
- },
- {
"displayName": "Server Keystore Secret Name",
"description": "The name of the secret containing the keystore file",
"name": "HTTPS_SECRET",
@@ -272,6 +265,12 @@
"name": "POSTGRESQL_IMAGE_STREAM_TAG",
"value": "9.5",
"required": true
+ },
+ {
+ "description": "Container memory limit",
+ "name": "MEMORY_LIMIT",
+ "value": "1Gi",
+ "required": false
}
],
"objects": [
@@ -350,6 +349,32 @@
}
},
{
+ "kind": "Service",
+ "apiVersion": "v1",
+ "spec": {
+ "clusterIP": "None",
+ "ports": [
+ {
+ "name": "ping",
+ "port": 8888
+ }
+ ],
+ "selector": {
+ "deploymentConfig": "${APPLICATION_NAME}"
+ }
+ },
+ "metadata": {
+ "name": "${APPLICATION_NAME}-ping",
+ "labels": {
+ "application": "${APPLICATION_NAME}"
+ },
+ "annotations": {
+ "service.alpha.kubernetes.io/tolerate-unready-endpoints": "true",
+ "description": "The JGroups ping port for clustering."
+ }
+ }
+ },
+ {
"kind": "Route",
"apiVersion": "v1",
"id": "${APPLICATION_NAME}-http",
@@ -437,7 +462,7 @@
"from": {
"kind": "ImageStreamTag",
"namespace": "${IMAGE_STREAM_NAMESPACE}",
- "name": "jboss-eap70-openshift:1.6"
+ "name": "jboss-eap70-openshift:1.7"
}
}
},
@@ -514,13 +539,17 @@
}
},
"spec": {
- "serviceAccountName": "${SERVICE_ACCOUNT_NAME}",
"terminationGracePeriodSeconds": 75,
"containers": [
{
"name": "${APPLICATION_NAME}",
"image": "${APPLICATION_NAME}",
"imagePullPolicy": "Always",
+ "resources": {
+ "limits": {
+ "memory": "${MEMORY_LIMIT}"
+ }
+ },
"volumeMounts": [
{
"name": "eap-keystore-volume",
@@ -540,7 +569,8 @@
"-c",
"/opt/eap/bin/livenessProbe.sh"
]
- }
+ },
+ "initialDelaySeconds": 60
},
"readinessProbe": {
"exec": {
@@ -611,16 +641,16 @@
"value": "${DB_TX_ISOLATION}"
},
{
- "name": "OPENSHIFT_KUBE_PING_LABELS",
- "value": "application=${APPLICATION_NAME}"
+ "name": "JGROUPS_PING_PROTOCOL",
+ "value": "openshift.DNS_PING"
+ },
+ {
+ "name": "OPENSHIFT_DNS_PING_SERVICE_NAME",
+ "value": "${APPLICATION_NAME}-ping"
},
{
- "name": "OPENSHIFT_KUBE_PING_NAMESPACE",
- "valueFrom": {
- "fieldRef": {
- "fieldPath": "metadata.namespace"
- }
- }
+ "name": "OPENSHIFT_DNS_PING_SERVICE_PORT",
+ "value": "8888"
},
{
"name": "HTTPS_KEYSTORE_DIR",
@@ -793,8 +823,22 @@
"name": "POSTGRESQL_SHARED_BUFFERS",
"value": "${POSTGRESQL_SHARED_BUFFERS}"
}
+ ],
+ "volumeMounts": [
+ {
+ "mountPath": "/var/lib/pgsql/data",
+ "name": "${APPLICATION_NAME}-data"
+ }
]
}
+ ],
+ "volumes": [
+ {
+ "emptyDir": {
+ "medium": ""
+ },
+ "name": "${APPLICATION_NAME}-data"
+ }
]
}
}