Merge pull request #14824 from jim-minter/tsb-expose-hyphens

Merged by openshift-bot
openshift · Jun 23, 2017 · c3c286b · c3c286b
2 parents 57c0aed + 417c7c2
commit c3c286b
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/examples/db-templates/mariadb-ephemeral-template.json b/examples/db-templates/mariadb-ephemeral-template.json
@@ -27,7 +27,7 @@
         "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']}"
+          "template.openshift.io/expose-root_password": "{.data['database-root-password']}"
         }
       },
       "stringData" : {

diff --git a/examples/db-templates/mariadb-persistent-template.json b/examples/db-templates/mariadb-persistent-template.json
@@ -27,7 +27,7 @@
         "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']}"
+          "template.openshift.io/expose-root_password": "{.data['database-root-password']}"
         }
       },
       "stringData" : {

diff --git a/examples/db-templates/mongodb-ephemeral-template.json b/examples/db-templates/mongodb-ephemeral-template.json
@@ -28,7 +28,7 @@
         "annotations": {
           "template.openshift.io/expose-username": "{.data['database-user']}",
           "template.openshift.io/expose-password": "{.data['database-password']}",
-          "template.openshift.io/expose-admin-password": "{.data['database-admin-password']}"
+          "template.openshift.io/expose-admin_password": "{.data['database-admin-password']}"
         }
       },
       "stringData" : {

diff --git a/examples/db-templates/mongodb-persistent-template.json b/examples/db-templates/mongodb-persistent-template.json
@@ -28,7 +28,7 @@
         "annotations": {
           "template.openshift.io/expose-username": "{.data['database-user']}",
           "template.openshift.io/expose-password": "{.data['database-password']}",
-          "template.openshift.io/expose-admin-password": "{.data['database-admin-password']}"
+          "template.openshift.io/expose-admin_password": "{.data['database-admin-password']}"
         }
       },
       "stringData" : {

diff --git a/examples/db-templates/mysql-ephemeral-template.json b/examples/db-templates/mysql-ephemeral-template.json
@@ -27,7 +27,7 @@
         "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']}"
+          "template.openshift.io/expose-root_password": "{.data['database-root-password']}"
         }
       },
       "stringData" : {

diff --git a/examples/db-templates/mysql-persistent-template.json b/examples/db-templates/mysql-persistent-template.json
@@ -27,7 +27,7 @@
         "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']}"
+          "template.openshift.io/expose-root_password": "{.data['database-root-password']}"
         }
       },
       "stringData" : {

diff --git a/pkg/bootstrap/bindata.go b/pkg/bootstrap/bindata.go
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go