1. origin
  2. Commit a5eaf994f6e86e28bff529de7da66a708f029699
Browse code

Merge pull request #12340 from chrira/adapt_secret_keys

Merged by openshift-bot

OpenShift Bot authored on 2017/01/03 12:46:07
Showing 9 changed files
examples/db-templates/mariadb-ephemeral-template.json
History View file @ a5eaf99
... ... 
@@ -22,9 +22,9 @@
22 22 
         "name": "${DATABASE_SERVICE_NAME}"
23 23 
       },
24 24 
       "stringData" : {
25 
-        "databaseUser" : "${MYSQL_USER}",
26 
-        "databasePassword" : "${MYSQL_PASSWORD}",
27 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
25 
+        "database-user" : "${MYSQL_USER}",
26 
+        "database-password" : "${MYSQL_PASSWORD}",
27 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
28 28 
       }
29 29 
     },
30 30 
     {
... ... 
@@ -115,7 +115,7 @@
115 115 
                     "valueFrom": {
116 116 
                       "secretKeyRef" : {
117 117 
                         "name" : "${DATABASE_SERVICE_NAME}",
118 
-                        "key" : "databaseUser"
118 
+                        "key" : "database-user"
119 119 
                       }
120 120 
                     }
121 121 
                   },
... ... 
@@ -124,7 +124,7 @@
124 124 
                     "valueFrom": {
125 125 
                       "secretKeyRef" : {
126 126 
                         "name" : "${DATABASE_SERVICE_NAME}",
127 
-                        "key" : "databasePassword"
127 
+                        "key" : "database-password"
128 128 
                       }
129 129 
                     }
130 130 
                   },
... ... 
@@ -133,7 +133,7 @@
133 133 
                     "valueFrom": {
134 134 
                       "secretKeyRef" : {
135 135 
                         "name" : "${DATABASE_SERVICE_NAME}",
136 
-                        "key" : "databaseRootPassword"
136 
+                        "key" : "database-root-password"
137 137 
                       }
138 138 
                     }
139 139 
                   },
examples/db-templates/mariadb-persistent-template.json
History View file @ a5eaf99
... ... 
@@ -22,9 +22,9 @@
22 22 
         "name": "${DATABASE_SERVICE_NAME}"
23 23 
       },
24 24 
       "stringData" : {
25 
-        "databaseUser" : "${MYSQL_USER}",
26 
-        "databasePassword" : "${MYSQL_PASSWORD}",
27 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
25 
+        "database-user" : "${MYSQL_USER}",
26 
+        "database-password" : "${MYSQL_PASSWORD}",
27 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
28 28 
       }
29 29 
     },
30 30 
     {
... ... 
@@ -132,7 +132,7 @@
132 132 
                     "valueFrom": {
133 133 
                       "secretKeyRef" : {
134 134 
                         "name" : "${DATABASE_SERVICE_NAME}",
135 
-                        "key" : "databaseUser"
135 
+                        "key" : "database-user"
136 136 
                       }
137 137 
                     }
138 138 
                   },
... ... 
@@ -141,7 +141,7 @@
141 141 
                     "valueFrom": {
142 142 
                       "secretKeyRef" : {
143 143 
                         "name" : "${DATABASE_SERVICE_NAME}",
144 
-                        "key" : "databasePassword"
144 
+                        "key" : "database-password"
145 145 
                       }
146 146 
                     }
147 147 
                   },
... ... 
@@ -150,7 +150,7 @@
150 150 
                     "valueFrom": {
151 151 
                       "secretKeyRef" : {
152 152 
                         "name" : "${DATABASE_SERVICE_NAME}",
153 
-                        "key" : "databaseRootPassword"
153 
+                        "key" : "database-root-password"
154 154 
                       }
155 155 
                     }
156 156 
                   },
examples/db-templates/mongodb-ephemeral-template.json
History View file @ a5eaf99
... ... 
@@ -23,9 +23,9 @@
23 23 
         "name": "${DATABASE_SERVICE_NAME}"
24 24 
       },
25 25 
       "stringData" : {
26 
-        "databaseUser" : "${MONGODB_USER}",
27 
-        "databasePassword" : "${MONGODB_PASSWORD}",
28 
-        "databaseAdminPassword" : "${MONGODB_ADMIN_PASSWORD}"
26 
+        "database-user" : "${MONGODB_USER}",
27 
+        "database-password" : "${MONGODB_PASSWORD}",
28 
+        "database-admin-password" : "${MONGODB_ADMIN_PASSWORD}"
29 29 
       }
30 30 
     },
31 31 
     {
... ... 
@@ -128,7 +128,7 @@
128 128 
                     "valueFrom": {
129 129 
                       "secretKeyRef" : {
130 130 
                         "name" : "${DATABASE_SERVICE_NAME}",
131 
-                        "key" : "databaseUser"
131 
+                        "key" : "database-user"
132 132 
                       }
133 133 
                     }
134 134 
                   },
... ... 
@@ -137,7 +137,7 @@
137 137 
                     "valueFrom": {
138 138 
                       "secretKeyRef" : {
139 139 
                         "name" : "${DATABASE_SERVICE_NAME}",
140 
-                        "key" : "databasePassword"
140 
+                        "key" : "database-password"
141 141 
                       }
142 142 
                     }
143 143 
                   },
... ... 
@@ -146,7 +146,7 @@
146 146 
                     "valueFrom": {
147 147 
                       "secretKeyRef" : {
148 148 
                         "name" : "${DATABASE_SERVICE_NAME}",
149 
-                        "key" : "databaseAdminPassword"
149 
+                        "key" : "database-admin-password"
150 150 
                       }
151 151 
                     }
152 152 
                   },
examples/db-templates/mongodb-persistent-template.json
History View file @ a5eaf99
... ... 
@@ -23,9 +23,9 @@
23 23 
         "name": "${DATABASE_SERVICE_NAME}"
24 24 
       },
25 25 
       "stringData" : {
26 
-        "databaseUser" : "${MONGODB_USER}",
27 
-        "databasePassword" : "${MONGODB_PASSWORD}",
28 
-        "databaseAdminPassword" : "${MONGODB_ADMIN_PASSWORD}"
26 
+        "database-user" : "${MONGODB_USER}",
27 
+        "database-password" : "${MONGODB_PASSWORD}",
28 
+        "database-admin-password" : "${MONGODB_ADMIN_PASSWORD}"
29 29 
       }
30 30 
     },
31 31 
     {
... ... 
@@ -145,7 +145,7 @@
145 145 
                     "valueFrom": {
146 146 
                       "secretKeyRef" : {
147 147 
                         "name" : "${DATABASE_SERVICE_NAME}",
148 
-                        "key" : "databaseUser"
148 
+                        "key" : "database-user"
149 149 
                       }
150 150 
                     }
151 151 
                   },
... ... 
@@ -154,7 +154,7 @@
154 154 
                     "valueFrom": {
155 155 
                       "secretKeyRef" : {
156 156 
                         "name" : "${DATABASE_SERVICE_NAME}",
157 
-                        "key" : "databasePassword"
157 
+                        "key" : "database-password"
158 158 
                       }
159 159 
                     }
160 160 
                   },
... ... 
@@ -163,7 +163,7 @@
163 163 
                     "valueFrom": {
164 164 
                       "secretKeyRef" : {
165 165 
                         "name" : "${DATABASE_SERVICE_NAME}",
166 
-                        "key" : "databaseAdminPassword"
166 
+                        "key" : "database-admin-password"
167 167 
                       }
168 168 
                     }
169 169 
                   },
examples/db-templates/mysql-ephemeral-template.json
History View file @ a5eaf99
... ... 
@@ -22,9 +22,9 @@
22 22 
         "name": "${DATABASE_SERVICE_NAME}"
23 23 
       },
24 24 
       "stringData" : {
25 
-        "databaseUser" : "${MYSQL_USER}",
26 
-        "databasePassword" : "${MYSQL_PASSWORD}",
27 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
25 
+        "database-user" : "${MYSQL_USER}",
26 
+        "database-password" : "${MYSQL_PASSWORD}",
27 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
28 28 
       }
29 29 
     },
30 30 
     {
... ... 
@@ -128,7 +128,7 @@
128 128 
                     "valueFrom": {
129 129 
                       "secretKeyRef" : {
130 130 
                         "name" : "${DATABASE_SERVICE_NAME}",
131 
-                        "key" : "databaseUser"
131 
+                        "key" : "database-user"
132 132 
                       }
133 133 
                     }
134 134 
                   },
... ... 
@@ -137,7 +137,7 @@
137 137 
                     "valueFrom": {
138 138 
                       "secretKeyRef" : {
139 139 
                         "name" : "${DATABASE_SERVICE_NAME}",
140 
-                        "key" : "databasePassword"
140 
+                        "key" : "database-password"
141 141 
                       }
142 142 
                     }
143 143 
                   },
... ... 
@@ -146,7 +146,7 @@
146 146 
                     "valueFrom": {
147 147 
                       "secretKeyRef" : {
148 148 
                         "name" : "${DATABASE_SERVICE_NAME}",
149 
-                        "key" : "databaseRootPassword"
149 
+                        "key" : "database-root-password"
150 150 
                       }
151 151 
                     }
152 152 
                   },
examples/db-templates/mysql-persistent-template.json
History View file @ a5eaf99
... ... 
@@ -22,9 +22,9 @@
22 22 
         "name": "${DATABASE_SERVICE_NAME}"
23 23 
       },
24 24 
       "stringData" : {
25 
-        "databaseUser" : "${MYSQL_USER}",
26 
-        "databasePassword" : "${MYSQL_PASSWORD}",
27 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
25 
+        "database-user" : "${MYSQL_USER}",
26 
+        "database-password" : "${MYSQL_PASSWORD}",
27 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
28 28 
       }
29 29 
     },
30 30 
     {
... ... 
@@ -132,7 +132,7 @@
132 132 
                     "valueFrom": {
133 133 
                       "secretKeyRef" : {
134 134 
                         "name" : "${DATABASE_SERVICE_NAME}",
135 
-                        "key" : "databaseUser"
135 
+                        "key" : "database-user"
136 136 
                       }
137 137 
                     }
138 138 
                   },
... ... 
@@ -141,7 +141,7 @@
141 141 
                     "valueFrom": {
142 142 
                       "secretKeyRef" : {
143 143 
                         "name" : "${DATABASE_SERVICE_NAME}",
144 
-                        "key" : "databasePassword"
144 
+                        "key" : "database-password"
145 145 
                       }
146 146 
                     }
147 147 
                   },
... ... 
@@ -150,7 +150,7 @@
150 150 
                     "valueFrom": {
151 151 
                       "secretKeyRef" : {
152 152 
                         "name" : "${DATABASE_SERVICE_NAME}",
153 
-                        "key" : "databaseRootPassword"
153 
+                        "key" : "database-root-password"
154 154 
                       }
155 155 
                     }
156 156 
                   },
examples/db-templates/postgresql-ephemeral-template.json
History View file @ a5eaf99
... ... 
@@ -23,8 +23,8 @@
23 23 
         "name": "${DATABASE_SERVICE_NAME}"
24 24 
       },
25 25 
       "stringData" : {
26 
-        "databaseUser" : "${POSTGRESQL_USER}",
27 
-        "databasePassword" : "${POSTGRESQL_PASSWORD}"
26 
+        "database-user" : "${POSTGRESQL_USER}",
27 
+        "database-password" : "${POSTGRESQL_PASSWORD}"
28 28 
       }
29 29 
     },
30 30 
     {
... ... 
@@ -127,7 +127,7 @@
127 127 
                     "valueFrom": {
128 128 
                       "secretKeyRef" : {
129 129 
                         "name" : "${DATABASE_SERVICE_NAME}",
130 
-                        "key" : "databaseUser"
130 
+                        "key" : "database-user"
131 131 
                       }
132 132 
                     }
133 133 
                   },
... ... 
@@ -136,7 +136,7 @@
136 136 
                     "valueFrom": {
137 137 
                       "secretKeyRef" : {
138 138 
                         "name" : "${DATABASE_SERVICE_NAME}",
139 
-                        "key" : "databasePassword"
139 
+                        "key" : "database-password"
140 140 
                       }
141 141 
                     }
142 142 
                   },
examples/db-templates/postgresql-persistent-template.json
History View file @ a5eaf99
... ... 
@@ -23,8 +23,8 @@
23 23 
         "name": "${DATABASE_SERVICE_NAME}"
24 24 
       },
25 25 
       "stringData" : {
26 
-        "databaseUser" : "${POSTGRESQL_USER}",
27 
-        "databasePassword" : "${POSTGRESQL_PASSWORD}"
26 
+        "database-user" : "${POSTGRESQL_USER}",
27 
+        "database-password" : "${POSTGRESQL_PASSWORD}"
28 28 
       }
29 29 
     },
30 30 
     {
... ... 
@@ -144,7 +144,7 @@
144 144 
                     "valueFrom": {
145 145 
                       "secretKeyRef" : {
146 146 
                         "name" : "${DATABASE_SERVICE_NAME}",
147 
-                        "key" : "databaseUser"
147 
+                        "key" : "database-user"
148 148 
                       }
149 149 
                     }
150 150 
                   },
... ... 
@@ -153,7 +153,7 @@
153 153 
                     "valueFrom": {
154 154 
                       "secretKeyRef" : {
155 155 
                         "name" : "${DATABASE_SERVICE_NAME}",
156 
-                        "key" : "databasePassword"
156 
+                        "key" : "database-password"
157 157 
                       }
158 158 
                     }
159 159 
                   },
pkg/bootstrap/bindata.go
History View file @ a5eaf99
... ... 
@@ -1691,9 +1691,9 @@ var _examplesDbTemplatesMariadbEphemeralTemplateJson = []byte(`{
1691 1691 
         "name": "${DATABASE_SERVICE_NAME}"
1692 1692 
       },
1693 1693 
       "stringData" : {
1694 
-        "databaseUser" : "${MYSQL_USER}",
1695 
-        "databasePassword" : "${MYSQL_PASSWORD}",
1696 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
1694 
+        "database-user" : "${MYSQL_USER}",
1695 
+        "database-password" : "${MYSQL_PASSWORD}",
1696 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
1697 1697 
       }
1698 1698 
     },
1699 1699 
     {
... ... 
@@ -1784,7 +1784,7 @@ var _examplesDbTemplatesMariadbEphemeralTemplateJson = []byte(`{
1784 1784 
                     "valueFrom": {
1785 1785 
                       "secretKeyRef" : {
1786 1786 
                         "name" : "${DATABASE_SERVICE_NAME}",
1787 
-                        "key" : "databaseUser"
1787 
+                        "key" : "database-user"
1788 1788 
                       }
1789 1789 
                     }
1790 1790 
                   },
... ... 
@@ -1793,7 +1793,7 @@ var _examplesDbTemplatesMariadbEphemeralTemplateJson = []byte(`{
1793 1793 
                     "valueFrom": {
1794 1794 
                       "secretKeyRef" : {
1795 1795 
                         "name" : "${DATABASE_SERVICE_NAME}",
1796 
-                        "key" : "databasePassword"
1796 
+                        "key" : "database-password"
1797 1797 
                       }
1798 1798 
                     }
1799 1799 
                   },
... ... 
@@ -1802,7 +1802,7 @@ var _examplesDbTemplatesMariadbEphemeralTemplateJson = []byte(`{
1802 1802 
                     "valueFrom": {
1803 1803 
                       "secretKeyRef" : {
1804 1804 
                         "name" : "${DATABASE_SERVICE_NAME}",
1805 
-                        "key" : "databaseRootPassword"
1805 
+                        "key" : "database-root-password"
1806 1806 
                       }
1807 1807 
                     }
1808 1808 
                   },
... ... 
@@ -1933,9 +1933,9 @@ var _examplesDbTemplatesMariadbPersistentTemplateJson = []byte(`{
1933 1933 
         "name": "${DATABASE_SERVICE_NAME}"
1934 1934 
       },
1935 1935 
       "stringData" : {
1936 
-        "databaseUser" : "${MYSQL_USER}",
1937 
-        "databasePassword" : "${MYSQL_PASSWORD}",
1938 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
1936 
+        "database-user" : "${MYSQL_USER}",
1937 
+        "database-password" : "${MYSQL_PASSWORD}",
1938 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
1939 1939 
       }
1940 1940 
     },
1941 1941 
     {
... ... 
@@ -2043,7 +2043,7 @@ var _examplesDbTemplatesMariadbPersistentTemplateJson = []byte(`{
2043 2043 
                     "valueFrom": {
2044 2044 
                       "secretKeyRef" : {
2045 2045 
                         "name" : "${DATABASE_SERVICE_NAME}",
2046 
-                        "key" : "databaseUser"
2046 
+                        "key" : "database-user"
2047 2047 
                       }
2048 2048 
                     }
2049 2049 
                   },
... ... 
@@ -2052,7 +2052,7 @@ var _examplesDbTemplatesMariadbPersistentTemplateJson = []byte(`{
2052 2052 
                     "valueFrom": {
2053 2053 
                       "secretKeyRef" : {
2054 2054 
                         "name" : "${DATABASE_SERVICE_NAME}",
2055 
-                        "key" : "databasePassword"
2055 
+                        "key" : "database-password"
2056 2056 
                       }
2057 2057 
                     }
2058 2058 
                   },
... ... 
@@ -2061,7 +2061,7 @@ var _examplesDbTemplatesMariadbPersistentTemplateJson = []byte(`{
2061 2061 
                     "valueFrom": {
2062 2062 
                       "secretKeyRef" : {
2063 2063 
                         "name" : "${DATABASE_SERVICE_NAME}",
2064 
-                        "key" : "databaseRootPassword"
2064 
+                        "key" : "database-root-password"
2065 2065 
                       }
2066 2066 
                     }
2067 2067 
                   },
... ... 
@@ -2200,9 +2200,9 @@ var _examplesDbTemplatesMongodbEphemeralTemplateJson = []byte(`{
2200 2200 
         "name": "${DATABASE_SERVICE_NAME}"
2201 2201 
       },
2202 2202 
       "stringData" : {
2203 
-        "databaseUser" : "${MONGODB_USER}",
2204 
-        "databasePassword" : "${MONGODB_PASSWORD}",
2205 
-        "databaseAdminPassword" : "${MONGODB_ADMIN_PASSWORD}"
2203 
+        "database-user" : "${MONGODB_USER}",
2204 
+        "database-password" : "${MONGODB_PASSWORD}",
2205 
+        "database-admin-password" : "${MONGODB_ADMIN_PASSWORD}"
2206 2206 
       }
2207 2207 
     },
2208 2208 
     {
... ... 
@@ -2305,7 +2305,7 @@ var _examplesDbTemplatesMongodbEphemeralTemplateJson = []byte(`{
2305 2305 
                     "valueFrom": {
2306 2306 
                       "secretKeyRef" : {
2307 2307 
                         "name" : "${DATABASE_SERVICE_NAME}",
2308 
-                        "key" : "databaseUser"
2308 
+                        "key" : "database-user"
2309 2309 
                       }
2310 2310 
                     }
2311 2311 
                   },
... ... 
@@ -2314,7 +2314,7 @@ var _examplesDbTemplatesMongodbEphemeralTemplateJson = []byte(`{
2314 2314 
                     "valueFrom": {
2315 2315 
                       "secretKeyRef" : {
2316 2316 
                         "name" : "${DATABASE_SERVICE_NAME}",
2317 
-                        "key" : "databasePassword"
2317 
+                        "key" : "database-password"
2318 2318 
                       }
2319 2319 
                     }
2320 2320 
                   },
... ... 
@@ -2323,7 +2323,7 @@ var _examplesDbTemplatesMongodbEphemeralTemplateJson = []byte(`{
2323 2323 
                     "valueFrom": {
2324 2324 
                       "secretKeyRef" : {
2325 2325 
                         "name" : "${DATABASE_SERVICE_NAME}",
2326 
-                        "key" : "databaseAdminPassword"
2326 
+                        "key" : "database-admin-password"
2327 2327 
                       }
2328 2328 
                     }
2329 2329 
                   },
... ... 
@@ -2470,9 +2470,9 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{
2470 2470 
         "name": "${DATABASE_SERVICE_NAME}"
2471 2471 
       },
2472 2472 
       "stringData" : {
2473 
-        "databaseUser" : "${MONGODB_USER}",
2474 
-        "databasePassword" : "${MONGODB_PASSWORD}",
2475 
-        "databaseAdminPassword" : "${MONGODB_ADMIN_PASSWORD}"
2473 
+        "database-user" : "${MONGODB_USER}",
2474 
+        "database-password" : "${MONGODB_PASSWORD}",
2475 
+        "database-admin-password" : "${MONGODB_ADMIN_PASSWORD}"
2476 2476 
       }
2477 2477 
     },
2478 2478 
     {
... ... 
@@ -2592,7 +2592,7 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{
2592 2592 
                     "valueFrom": {
2593 2593 
                       "secretKeyRef" : {
2594 2594 
                         "name" : "${DATABASE_SERVICE_NAME}",
2595 
-                        "key" : "databaseUser"
2595 
+                        "key" : "database-user"
2596 2596 
                       }
2597 2597 
                     }
2598 2598 
                   },
... ... 
@@ -2601,7 +2601,7 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{
2601 2601 
                     "valueFrom": {
2602 2602 
                       "secretKeyRef" : {
2603 2603 
                         "name" : "${DATABASE_SERVICE_NAME}",
2604 
-                        "key" : "databasePassword"
2604 
+                        "key" : "database-password"
2605 2605 
                       }
2606 2606 
                     }
2607 2607 
                   },
... ... 
@@ -2610,7 +2610,7 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{
2610 2610 
                     "valueFrom": {
2611 2611 
                       "secretKeyRef" : {
2612 2612 
                         "name" : "${DATABASE_SERVICE_NAME}",
2613 
-                        "key" : "databaseAdminPassword"
2613 
+                        "key" : "database-admin-password"
2614 2614 
                       }
2615 2615 
                     }
2616 2616 
                   },
... ... 
@@ -2763,9 +2763,9 @@ var _examplesDbTemplatesMysqlEphemeralTemplateJson = []byte(`{
2763 2763 
         "name": "${DATABASE_SERVICE_NAME}"
2764 2764 
       },
2765 2765 
       "stringData" : {
2766 
-        "databaseUser" : "${MYSQL_USER}",
2767 
-        "databasePassword" : "${MYSQL_PASSWORD}",
2768 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
2766 
+        "database-user" : "${MYSQL_USER}",
2767 
+        "database-password" : "${MYSQL_PASSWORD}",
2768 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
2769 2769 
       }
2770 2770 
     },
2771 2771 
     {
... ... 
@@ -2869,7 +2869,7 @@ var _examplesDbTemplatesMysqlEphemeralTemplateJson = []byte(`{
2869 2869 
                     "valueFrom": {
2870 2870 
                       "secretKeyRef" : {
2871 2871 
                         "name" : "${DATABASE_SERVICE_NAME}",
2872 
-                        "key" : "databaseUser"
2872 
+                        "key" : "database-user"
2873 2873 
                       }
2874 2874 
                     }
2875 2875 
                   },
... ... 
@@ -2878,7 +2878,7 @@ var _examplesDbTemplatesMysqlEphemeralTemplateJson = []byte(`{
2878 2878 
                     "valueFrom": {
2879 2879 
                       "secretKeyRef" : {
2880 2880 
                         "name" : "${DATABASE_SERVICE_NAME}",
2881 
-                        "key" : "databasePassword"
2881 
+                        "key" : "database-password"
2882 2882 
                       }
2883 2883 
                     }
2884 2884 
                   },
... ... 
@@ -2887,7 +2887,7 @@ var _examplesDbTemplatesMysqlEphemeralTemplateJson = []byte(`{
2887 2887 
                     "valueFrom": {
2888 2888 
                       "secretKeyRef" : {
2889 2889 
                         "name" : "${DATABASE_SERVICE_NAME}",
2890 
-                        "key" : "databaseRootPassword"
2890 
+                        "key" : "database-root-password"
2891 2891 
                       }
2892 2892 
                     }
2893 2893 
                   },
... ... 
@@ -3033,9 +3033,9 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{
3033 3033 
         "name": "${DATABASE_SERVICE_NAME}"
3034 3034 
       },
3035 3035 
       "stringData" : {
3036 
-        "databaseUser" : "${MYSQL_USER}",
3037 
-        "databasePassword" : "${MYSQL_PASSWORD}",
3038 
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
3036 
+        "database-user" : "${MYSQL_USER}",
3037 
+        "database-password" : "${MYSQL_PASSWORD}",
3038 
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
3039 3039 
       }
3040 3040 
     },
3041 3041 
     {
... ... 
@@ -3143,7 +3143,7 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{
3143 3143 
                     "valueFrom": {
3144 3144 
                       "secretKeyRef" : {
3145 3145 
                         "name" : "${DATABASE_SERVICE_NAME}",
3146 
-                        "key" : "databaseUser"
3146 
+                        "key" : "database-user"
3147 3147 
                       }
3148 3148 
                     }
3149 3149 
                   },
... ... 
@@ -3152,7 +3152,7 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{
3152 3152 
                     "valueFrom": {
3153 3153 
                       "secretKeyRef" : {
3154 3154 
                         "name" : "${DATABASE_SERVICE_NAME}",
3155 
-                        "key" : "databasePassword"
3155 
+                        "key" : "database-password"
3156 3156 
                       }
3157 3157 
                     }
3158 3158 
                   },
... ... 
@@ -3161,7 +3161,7 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{
3161 3161 
                     "valueFrom": {
3162 3162 
                       "secretKeyRef" : {
3163 3163 
                         "name" : "${DATABASE_SERVICE_NAME}",
3164 
-                        "key" : "databaseRootPassword"
3164 
+                        "key" : "database-root-password"
3165 3165 
                       }
3166 3166 
                     }
3167 3167 
                   },
... ... 
@@ -3307,8 +3307,8 @@ var _examplesDbTemplatesPostgresqlEphemeralTemplateJson = []byte(`{
3307 3307 
         "name": "${DATABASE_SERVICE_NAME}"
3308 3308 
       },
3309 3309 
       "stringData" : {
3310 
-        "databaseUser" : "${POSTGRESQL_USER}",
3311 
-        "databasePassword" : "${POSTGRESQL_PASSWORD}"
3310 
+        "database-user" : "${POSTGRESQL_USER}",
3311 
+        "database-password" : "${POSTGRESQL_PASSWORD}"
3312 3312 
       }
3313 3313 
     },
3314 3314 
     {
... ... 
@@ -3411,7 +3411,7 @@ var _examplesDbTemplatesPostgresqlEphemeralTemplateJson = []byte(`{
3411 3411 
                     "valueFrom": {
3412 3412 
                       "secretKeyRef" : {
3413 3413 
                         "name" : "${DATABASE_SERVICE_NAME}",
3414 
-                        "key" : "databaseUser"
3414 
+                        "key" : "database-user"
3415 3415 
                       }
3416 3416 
                     }
3417 3417 
                   },
... ... 
@@ -3420,7 +3420,7 @@ var _examplesDbTemplatesPostgresqlEphemeralTemplateJson = []byte(`{
3420 3420 
                     "valueFrom": {
3421 3421 
                       "secretKeyRef" : {
3422 3422 
                         "name" : "${DATABASE_SERVICE_NAME}",
3423 
-                        "key" : "databasePassword"
3423 
+                        "key" : "database-password"
3424 3424 
                       }
3425 3425 
                     }
3426 3426 
                   },
... ... 
@@ -3559,8 +3559,8 @@ var _examplesDbTemplatesPostgresqlPersistentTemplateJson = []byte(`{
3559 3559 
         "name": "${DATABASE_SERVICE_NAME}"
3560 3560 
       },
3561 3561 
       "stringData" : {
3562 
-        "databaseUser" : "${POSTGRESQL_USER}",
3563 
-        "databasePassword" : "${POSTGRESQL_PASSWORD}"
3562 
+        "database-user" : "${POSTGRESQL_USER}",
3563 
+        "database-password" : "${POSTGRESQL_PASSWORD}"
3564 3564 
       }
3565 3565 
     },
3566 3566 
     {
... ... 
@@ -3680,7 +3680,7 @@ var _examplesDbTemplatesPostgresqlPersistentTemplateJson = []byte(`{
3680 3680 
                     "valueFrom": {
3681 3681 
                       "secretKeyRef" : {
3682 3682 
                         "name" : "${DATABASE_SERVICE_NAME}",
3683 
-                        "key" : "databaseUser"
3683 
+                        "key" : "database-user"
3684 3684 
                       }
3685 3685 
                     }
3686 3686 
                   },
... ... 
@@ -3689,7 +3689,7 @@ var _examplesDbTemplatesPostgresqlPersistentTemplateJson = []byte(`{
3689 3689 
                     "valueFrom": {
3690 3690 
                       "secretKeyRef" : {
3691 3691 
                         "name" : "${DATABASE_SERVICE_NAME}",
3692 
-                        "key" : "databasePassword"
3692 
+                        "key" : "database-password"
3693 3693 
                       }
3694 3694 
                     }
3695 3695 
                   },