summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-30 16:51:00 -0400
committerGitHub <noreply@github.com>2017-06-30 16:51:00 -0400
commit31005495f571e02c671b90d2b4c0bb2d57fe4457 (patch)
tree4de7d3bf4363a2a88afc0e870baa5ad0b630c4da /roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json
parenta5e1e1fb2b068251c050722fd5f742dd3a92d93c (diff)
parent94feef04f73d970bb6ec45afa3629e368e6c7df6 (diff)
downloadopenshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.gz
openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.bz2
openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.tar.xz
openshift-31005495f571e02c671b90d2b4c0bb2d57fe4457.zip
Merge pull request #4659 from sdodson/image-stream-sync
Sync all content
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json25
1 files changed, 23 insertions, 2 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json b/roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json
index 1d5f59188..9e8be2309 100644
--- a/roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json
+++ b/roles/openshift_examples/files/examples/v1.4/db-templates/redis-persistent-template.json
@@ -21,11 +21,27 @@
},
"objects": [
{
+ "kind": "Secret",
+ "apiVersion": "v1",
+ "metadata": {
+ "name": "${DATABASE_SERVICE_NAME}",
+ "annotations": {
+ "template.openshift.io/expose-password": "{.data['database-password']}"
+ }
+ },
+ "stringData" : {
+ "database-password" : "${REDIS_PASSWORD}"
+ }
+ },
+ {
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "${DATABASE_SERVICE_NAME}",
- "creationTimestamp": null
+ "creationTimestamp": null,
+ "annotations": {
+ "template.openshift.io/expose-uri": "redis://{.spec.clusterIP}:{.spec.ports[?(.name==\"redis\")].port}"
+ }
},
"spec": {
"ports": [
@@ -134,7 +150,12 @@
"env": [
{
"name": "REDIS_PASSWORD",
- "value": "${REDIS_PASSWORD}"
+ "valueFrom": {
+ "secretKeyRef" : {
+ "name" : "${DATABASE_SERVICE_NAME}",
+ "key" : "database-password"
+ }
+ }
}
],
"resources": {