summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-17 17:17:54 -0500
committerGitHub <noreply@github.com>2017-01-17 17:17:54 -0500
commit9f7c33ec57e46bd79a59bd2b0c9a43326e26b492 (patch)
treedbb032cd5fb9bb66c54c1e2190dff51fff097589 /roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json
parenta269ece3556932cebfa2ade968ac2b8638c2abbf (diff)
parentf11aa2af5cc51c109908e91517db54543b16bea9 (diff)
downloadopenshift-9f7c33ec57e46bd79a59bd2b0c9a43326e26b492.tar.gz
openshift-9f7c33ec57e46bd79a59bd2b0c9a43326e26b492.tar.bz2
openshift-9f7c33ec57e46bd79a59bd2b0c9a43326e26b492.tar.xz
openshift-9f7c33ec57e46bd79a59bd2b0c9a43326e26b492.zip
Merge pull request #3098 from sdodson/image-stream-sync
Sync examples
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json43
1 files changed, 37 insertions, 6 deletions
diff --git a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json
index 354978891..9dbbf89d1 100644
--- a/roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json
+++ b/roles/openshift_examples/files/examples/v1.4/quickstart-templates/cakephp-mysql.json
@@ -16,6 +16,17 @@
},
"objects": [
{
+ "kind": "Secret",
+ "apiVersion": "v1",
+ "metadata": {
+ "name": "${NAME}"
+ },
+ "stringData" : {
+ "databaseUser" : "${DATABASE_USER}",
+ "databasePassword" : "${DATABASE_PASSWORD}"
+ }
+ },
+ {
"kind": "Service",
"apiVersion": "v1",
"metadata": {
@@ -212,11 +223,21 @@
},
{
"name": "DATABASE_USER",
- "value": "${DATABASE_USER}"
+ "valueFrom": {
+ "secretKeyRef" : {
+ "name" : "${NAME}",
+ "key" : "databaseUser"
+ }
+ }
},
{
"name": "DATABASE_PASSWORD",
- "value": "${DATABASE_PASSWORD}"
+ "valueFrom": {
+ "secretKeyRef" : {
+ "name" : "${NAME}",
+ "key" : "databasePassword"
+ }
+ }
},
{
"name": "CAKEPHP_SECRET_TOKEN",
@@ -349,12 +370,22 @@
},
"env": [
{
- "name": "MYSQL_USER",
- "value": "${DATABASE_USER}"
+ "name": "MYSQL_USER",
+ "valueFrom": {
+ "secretKeyRef" : {
+ "name" : "${NAME}",
+ "key" : "databaseUser"
+ }
+ }
},
{
- "name": "MYSQL_PASSWORD",
- "value": "${DATABASE_PASSWORD}"
+ "name": "MYSQL_PASSWORD",
+ "valueFrom": {
+ "secretKeyRef" : {
+ "name" : "${NAME}",
+ "key" : "databasePassword"
+ }
+ }
},
{
"name": "MYSQL_DATABASE",