summaryrefslogtreecommitdiffstats
path: root/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json')
-rw-r--r--roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json17
1 files changed, 8 insertions, 9 deletions
diff --git a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json
index 5f133b946..8a4ec41b2 100644
--- a/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json
+++ b/roles/openshift_examples/files/examples/v1.3/db-templates/mysql-ephemeral-template.json
@@ -3,7 +3,6 @@
"apiVersion": "v1",
"metadata": {
"name": "mysql-ephemeral",
- "creationTimestamp": null,
"annotations": {
"description": "MySQL database service, without persistent storage. WARNING: Any data stored will be lost upon pod destruction. Only use this template for testing",
"iconClass": "icon-mysql-database",
@@ -60,7 +59,7 @@
],
"from": {
"kind": "ImageStreamTag",
- "name": "mysql:latest",
+ "name": "mysql:5.6",
"namespace": "${NAMESPACE}"
},
"lastTriggeredImage": ""
@@ -122,10 +121,10 @@
}
],
"resources": {
- "limits": {
- "memory": "${MEMORY_LIMIT}"
- }
- },
+ "limits": {
+ "memory": "${MEMORY_LIMIT}"
+ }
+ },
"volumeMounts": [
{
"name": "${DATABASE_SERVICE_NAME}-data",
@@ -179,7 +178,7 @@
},
{
"name": "MYSQL_USER",
- "displayName": "MySQL User",
+ "displayName": "MySQL Connection Username",
"description": "Username for MySQL user that will be used for accessing the database.",
"generate": "expression",
"from": "user[A-Z0-9]{3}",
@@ -187,8 +186,8 @@
},
{
"name": "MYSQL_PASSWORD",
- "displayName": "MySQL Password",
- "description": "Password for the MySQL user.",
+ "displayName": "MySQL Connection Password",
+ "description": "Password for the MySQL connection user.",
"generate": "expression",
"from": "[a-zA-Z0-9]{16}",
"required": true