diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-02-19 09:56:06 -0500 |
---|---|---|
committer | Scott Dodson <sdodson@redhat.com> | 2016-03-14 09:27:39 -0400 |
commit | af5218491dc0c25079e7b97e16a3bb56c1a1421a (patch) | |
tree | 34311ef415a18bf1e3971a4e60233ed6a1477fe8 /roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json | |
parent | 388f75b83c44259278793d4faebb4c14c36d5c6f (diff) | |
download | openshift-af5218491dc0c25079e7b97e16a3bb56c1a1421a.tar.gz openshift-af5218491dc0c25079e7b97e16a3bb56c1a1421a.tar.bz2 openshift-af5218491dc0c25079e7b97e16a3bb56c1a1421a.tar.xz openshift-af5218491dc0c25079e7b97e16a3bb56c1a1421a.zip |
Sync with latest image stream and templates
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json')
-rw-r--r-- | roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json b/roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json index 91cd7453e..df8a34a9e 100644 --- a/roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json +++ b/roles/openshift_examples/files/examples/v1.1/db-templates/postgresql-persistent-template.json @@ -65,8 +65,7 @@ }, "spec": { "strategy": { - "type": "Recreate", - "resources": {} + "type": "Recreate" }, "triggers": [ { @@ -110,6 +109,20 @@ "protocol": "TCP" } ], + "readinessProbe": { + "timeoutSeconds": 1, + "initialDelaySeconds": 5, + "exec": { + "command": [ "/bin/sh", "-i", "-c", "psql -h 127.0.0.1 -U $POSTGRESQL_USER -q -d $POSTGRESQL_DATABASE -c 'SELECT 1'"] + } + }, + "livenessProbe": { + "timeoutSeconds": 1, + "initialDelaySeconds": 30, + "tcpSocket": { + "port": 5432 + } + }, "env": [ { "name": "POSTGRESQL_USER", @@ -124,7 +137,11 @@ "value": "${POSTGRESQL_DATABASE}" } ], - "resources": {}, + "resources": { + "limits": { + "memory": "${MEMORY_LIMIT}" + } + }, "volumeMounts": [ { "name": "${DATABASE_SERVICE_NAME}-data", @@ -158,13 +175,21 @@ ], "parameters": [ { + "name": "MEMORY_LIMIT", + "displayName": "Memory limit", + "description": "Maximum amount of memory the container can use", + "value": "512Mi" + }, + { "name": "DATABASE_SERVICE_NAME", - "description": "Database service name", + "displayName": "Database service name", + "description": "The name of the OpenShift Service exposed for the database", "value": "postgresql", "required": true }, { "name": "POSTGRESQL_USER", + "displayName": "PostgreSQL user", "description": "Username for PostgreSQL user that will be used for accessing the database", "generate": "expression", "from": "user[A-Z0-9]{3}", @@ -172,6 +197,7 @@ }, { "name": "POSTGRESQL_PASSWORD", + "displayName": "PostgreSQL password", "description": "Password for the PostgreSQL user", "generate": "expression", "from": "[a-zA-Z0-9]{16}", @@ -179,12 +205,14 @@ }, { "name": "POSTGRESQL_DATABASE", - "description": "Database name", + "displayName": "PostgreSQL database name", + "description": "Name of the PostgreSQL database accessed", "value": "sampledb", "required": true }, { "name": "VOLUME_CAPACITY", + "displayName": "Volume capacity", "description": "Volume space available for data, e.g. 512Mi, 2Gi", "value": "512Mi", "required": true |