summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-22 12:03:14 -0400
committerGitHub <noreply@github.com>2017-06-22 12:03:14 -0400
commit6c0760068922d06ca161d833c1e9dc442ab8960e (patch)
tree034db0134acabc525164c2aa23114a3c06965836 /roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json
parente18bd4fbe1b8035e87140390c0c27c73282b5ea3 (diff)
parentaa6b6a0912b7404288f907baf5c72d481ef1b902 (diff)
downloadopenshift-6c0760068922d06ca161d833c1e9dc442ab8960e.tar.gz
openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.tar.bz2
openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.tar.xz
openshift-6c0760068922d06ca161d833c1e9dc442ab8960e.zip
Merge pull request #4528 from mtnbikenc/update-templates
Update template examples for 3.6
Diffstat (limited to 'roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json')
-rw-r--r--roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json12
1 files changed, 10 insertions, 2 deletions
diff --git a/roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json b/roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json
index 6ed744777..3d8f592cb 100644
--- a/roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json
+++ b/roles/openshift_examples/files/examples/v3.6/db-templates/mariadb-persistent-template.json
@@ -23,7 +23,12 @@
"kind": "Secret",
"apiVersion": "v1",
"metadata": {
- "name": "${DATABASE_SERVICE_NAME}"
+ "name": "${DATABASE_SERVICE_NAME}",
+ "annotations": {
+ "template.openshift.io/expose-username": "{.data['database-user']}",
+ "template.openshift.io/expose-password": "{.data['database-password']}",
+ "template.openshift.io/expose-root-password": "{.data['database-root-password']}"
+ }
},
"stringData" : {
"database-user" : "${MYSQL_USER}",
@@ -35,7 +40,10 @@
"kind": "Service",
"apiVersion": "v1",
"metadata": {
- "name": "${DATABASE_SERVICE_NAME}"
+ "name": "${DATABASE_SERVICE_NAME}",
+ "annotations": {
+ "template.openshift.io/expose-uri": "mysql://{.spec.clusterIP}:{.spec.ports[?(.name==\"mariadb\")].port}"
+ }
},
"spec": {
"ports": [