Merge pull request #12340 from chrira/adapt_secret_keys

OpenShift Bot · web-flow · commit a5eaf994f6e8 · 2017-01-02T22:46:06.000-05:00
Merged by openshift-bot
diff --git a/examples/db-templates/mariadb-ephemeral-template.json b/examples/db-templates/mariadb-ephemeral-template.json
@@ -22,9 +22,9 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${MYSQL_USER}",
-        "databasePassword" : "${MYSQL_PASSWORD}",
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
+        "database-user" : "${MYSQL_USER}",
+        "database-password" : "${MYSQL_PASSWORD}",
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
       }
     },
     {
@@ -115,7 +115,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -124,7 +124,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -133,7 +133,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseRootPassword"
+                        "key" : "database-root-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/mariadb-persistent-template.json b/examples/db-templates/mariadb-persistent-template.json
@@ -22,9 +22,9 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${MYSQL_USER}",
-        "databasePassword" : "${MYSQL_PASSWORD}",
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
+        "database-user" : "${MYSQL_USER}",
+        "database-password" : "${MYSQL_PASSWORD}",
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
       }
     },
     {
@@ -132,7 +132,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -141,7 +141,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -150,7 +150,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseRootPassword"
+                        "key" : "database-root-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/mongodb-ephemeral-template.json b/examples/db-templates/mongodb-ephemeral-template.json
@@ -23,9 +23,9 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${MONGODB_USER}",
-        "databasePassword" : "${MONGODB_PASSWORD}",
-        "databaseAdminPassword" : "${MONGODB_ADMIN_PASSWORD}"
+        "database-user" : "${MONGODB_USER}",
+        "database-password" : "${MONGODB_PASSWORD}",
+        "database-admin-password" : "${MONGODB_ADMIN_PASSWORD}"
       }
     },
     {
@@ -128,7 +128,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -137,7 +137,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -146,7 +146,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseAdminPassword"
+                        "key" : "database-admin-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/mongodb-persistent-template.json b/examples/db-templates/mongodb-persistent-template.json
@@ -23,9 +23,9 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${MONGODB_USER}",
-        "databasePassword" : "${MONGODB_PASSWORD}",
-        "databaseAdminPassword" : "${MONGODB_ADMIN_PASSWORD}"
+        "database-user" : "${MONGODB_USER}",
+        "database-password" : "${MONGODB_PASSWORD}",
+        "database-admin-password" : "${MONGODB_ADMIN_PASSWORD}"
       }
     },
     {
@@ -145,7 +145,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -154,7 +154,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -163,7 +163,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseAdminPassword"
+                        "key" : "database-admin-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/mysql-ephemeral-template.json b/examples/db-templates/mysql-ephemeral-template.json
@@ -22,9 +22,9 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${MYSQL_USER}",
-        "databasePassword" : "${MYSQL_PASSWORD}",
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
+        "database-user" : "${MYSQL_USER}",
+        "database-password" : "${MYSQL_PASSWORD}",
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
       }
     },
     {
@@ -128,7 +128,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -137,7 +137,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -146,7 +146,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseRootPassword"
+                        "key" : "database-root-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/mysql-persistent-template.json b/examples/db-templates/mysql-persistent-template.json
@@ -22,9 +22,9 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${MYSQL_USER}",
-        "databasePassword" : "${MYSQL_PASSWORD}",
-        "databaseRootPassword" : "${MYSQL_ROOT_PASSWORD}"
+        "database-user" : "${MYSQL_USER}",
+        "database-password" : "${MYSQL_PASSWORD}",
+        "database-root-password" : "${MYSQL_ROOT_PASSWORD}"
       }
     },
     {
@@ -132,7 +132,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -141,7 +141,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
@@ -150,7 +150,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseRootPassword"
+                        "key" : "database-root-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/postgresql-ephemeral-template.json b/examples/db-templates/postgresql-ephemeral-template.json
@@ -23,8 +23,8 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${POSTGRESQL_USER}",
-        "databasePassword" : "${POSTGRESQL_PASSWORD}"
+        "database-user" : "${POSTGRESQL_USER}",
+        "database-password" : "${POSTGRESQL_PASSWORD}"
       }
     },
     {
@@ -127,7 +127,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -136,7 +136,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
diff --git a/examples/db-templates/postgresql-persistent-template.json b/examples/db-templates/postgresql-persistent-template.json
@@ -23,8 +23,8 @@
         "name": "${DATABASE_SERVICE_NAME}"
       },
       "stringData" : {
-        "databaseUser" : "${POSTGRESQL_USER}",
-        "databasePassword" : "${POSTGRESQL_PASSWORD}"
+        "database-user" : "${POSTGRESQL_USER}",
+        "database-password" : "${POSTGRESQL_PASSWORD}"
       }
     },
     {
@@ -144,7 +144,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databaseUser"
+                        "key" : "database-user"
                       }
                     }
                   },
@@ -153,7 +153,7 @@
                     "valueFrom": {
                       "secretKeyRef" : {
                         "name" : "${DATABASE_SERVICE_NAME}",
-                        "key" : "databasePassword"
+                        "key" : "database-password"
                       }
                     }
                   },
diff --git a/pkg/bootstrap/bindata.go b/pkg/bootstrap/bindata.go

Original file line number	Diff line number	Diff line change
`@@ -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`	`},`
Original file line number	Diff line number	Diff line change
`@@ -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`	`},`
Original file line number	Diff line number	Diff line change
`@@ -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`	`},`