summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-30 11:27:03 -0400
committerScott Dodson <sdodson@redhat.com>2017-06-30 11:27:03 -0400
commit94feef04f73d970bb6ec45afa3629e368e6c7df6 (patch)
treeea21b825432feaec0aaece0643172afc27460946 /roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json
parent3e4d73be7e6b2b3eb5cbb736a989a318de904a45 (diff)
downloadopenshift-94feef04f73d970bb6ec45afa3629e368e6c7df6.tar.gz
openshift-94feef04f73d970bb6ec45afa3629e368e6c7df6.tar.bz2
openshift-94feef04f73d970bb6ec45afa3629e368e6c7df6.tar.xz
openshift-94feef04f73d970bb6ec45afa3629e368e6c7df6.zip
Update v1.4 image streams and templates
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json13
1 files changed, 10 insertions, 3 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json
index fa67412ff..a7992c988 100644
--- a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json
+++ b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/rails-postgresql.json
@@ -23,7 +23,11 @@
"kind": "Secret",
"apiVersion": "v1",
"metadata": {
- "name": "${NAME}"
+ "name": "${NAME}",
+ "annotations": {
+ "template.openshift.io/expose-username": "{.data['application-user']}",
+ "template.openshift.io/expose-password": "{.data['application-password']}"
+ }
},
"stringData" : {
"database-user" : "${DATABASE_USER}",
@@ -60,7 +64,10 @@
"kind": "Route",
"apiVersion": "v1",
"metadata": {
- "name": "${NAME}"
+ "name": "${NAME}",
+ "annotations": {
+ "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}"
+ }
},
"spec": {
"host": "${APPLICATION_DOMAIN}",
@@ -500,7 +507,7 @@
{
"name": "GITHUB_WEBHOOK_SECRET",
"displayName": "GitHub Webhook Secret",
- "description": "A secret string used to configure the GitHub webhook.",
+ "description": "Github trigger secret. A difficult to guess string encoded as part of the webhook URL. Not encrypted.",
"generate": "expression",
"from": "[a-zA-Z0-9]{40}"
},