From c408ca8d63a5fddd36026b5b74bf29b98a158786 Mon Sep 17 00:00:00 2001 From: gabemontero Date: Wed, 8 Nov 2017 14:06:41 -0500 Subject: [PATCH 1/2] add app label to quickstart, jenkins templates --- .../jenkins/jenkins-ephemeral-template.json | 3 ++ .../jenkins/jenkins-persistent-template.json | 3 ++ .../quickstarts/cakephp-mysql-persistent.json | 3 +- examples/quickstarts/cakephp-mysql.json | 3 +- .../quickstarts/dancer-mysql-persistent.json | 3 +- examples/quickstarts/dancer-mysql.json | 3 +- .../django-postgresql-persistent.json | 3 +- examples/quickstarts/django-postgresql.json | 3 +- examples/quickstarts/httpd.json | 3 +- .../nodejs-mongodb-persistent.json | 3 +- examples/quickstarts/nodejs-mongodb.json | 3 +- .../rails-postgresql-persistent.json | 3 +- examples/quickstarts/rails-postgresql.json | 3 +- pkg/oc/bootstrap/bindata.go | 39 ++++++++++++----- test/extended/testdata/bindata.go | 42 +++++++++++++------ 15 files changed, 86 insertions(+), 34 deletions(-) diff --git a/examples/jenkins/jenkins-ephemeral-template.json b/examples/jenkins/jenkins-ephemeral-template.json index 28b4b9d81644..6186bba10fdf 100644 --- a/examples/jenkins/jenkins-ephemeral-template.json +++ b/examples/jenkins/jenkins-ephemeral-template.json @@ -15,6 +15,9 @@ } }, "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", + "labels": { + "app": "jenkins-ephemeral" + }, "objects": [ { "kind": "Route", diff --git a/examples/jenkins/jenkins-persistent-template.json b/examples/jenkins/jenkins-persistent-template.json index 4915bb12c5c2..264fa892f36e 100644 --- a/examples/jenkins/jenkins-persistent-template.json +++ b/examples/jenkins/jenkins-persistent-template.json @@ -15,6 +15,9 @@ } }, "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", + "labels": { + "app": "jenkins-persistent" + }, "objects": [ { "kind": "Route", diff --git a/examples/quickstarts/cakephp-mysql-persistent.json b/examples/quickstarts/cakephp-mysql-persistent.json index a8b90a493009..6594f5752203 100644 --- a/examples/quickstarts/cakephp-mysql-persistent.json +++ b/examples/quickstarts/cakephp-mysql-persistent.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-persistent" + "template": "cakephp-mysql-persistent", + "app": "cakephp-mysql-persistent" }, "objects": [ { diff --git a/examples/quickstarts/cakephp-mysql.json b/examples/quickstarts/cakephp-mysql.json index e8439739425d..26516cf7bb61 100644 --- a/examples/quickstarts/cakephp-mysql.json +++ b/examples/quickstarts/cakephp-mysql.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-example" + "template": "cakephp-mysql-example", + "app": "cakephp-mysql-example" }, "objects": [ { diff --git a/examples/quickstarts/dancer-mysql-persistent.json b/examples/quickstarts/dancer-mysql-persistent.json index 96048f200a63..232972af0a7d 100644 --- a/examples/quickstarts/dancer-mysql-persistent.json +++ b/examples/quickstarts/dancer-mysql-persistent.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "labels": { - "template": "dancer-mysql-persistent" + "template": "dancer-mysql-persistent", + "app": "dancer-mysql-persistent" }, "objects": [ { diff --git a/examples/quickstarts/dancer-mysql.json b/examples/quickstarts/dancer-mysql.json index 1c87e05f38c9..fe8126d28b6e 100644 --- a/examples/quickstarts/dancer-mysql.json +++ b/examples/quickstarts/dancer-mysql.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "labels": { - "template": "dancer-mysql-example" + "template": "dancer-mysql-example", + "app": "dancer-mysql-example" }, "objects": [ { diff --git a/examples/quickstarts/django-postgresql-persistent.json b/examples/quickstarts/django-postgresql-persistent.json index 060f45daccf6..970bd3088937 100644 --- a/examples/quickstarts/django-postgresql-persistent.json +++ b/examples/quickstarts/django-postgresql-persistent.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "labels": { - "template": "django-psql-persistent" + "template": "django-psql-persistent", + "app": "django-psql-persistent" }, "objects": [ { diff --git a/examples/quickstarts/django-postgresql.json b/examples/quickstarts/django-postgresql.json index 66f2f0ca1221..90200205014b 100644 --- a/examples/quickstarts/django-postgresql.json +++ b/examples/quickstarts/django-postgresql.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "labels": { - "template": "django-psql-example" + "template": "django-psql-example", + "app": "django-psql-example" }, "objects": [ { diff --git a/examples/quickstarts/httpd.json b/examples/quickstarts/httpd.json index ebba9ee65ca6..d6fe8aaa897e 100644 --- a/examples/quickstarts/httpd.json +++ b/examples/quickstarts/httpd.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/httpd-ex/blob/master/README.md.", "labels": { - "template": "httpd-example" + "template": "httpd-example", + "app": "httpd-example" }, "objects": [ { diff --git a/examples/quickstarts/nodejs-mongodb-persistent.json b/examples/quickstarts/nodejs-mongodb-persistent.json index 9543b56812fc..ac0077ae994d 100644 --- a/examples/quickstarts/nodejs-mongodb-persistent.json +++ b/examples/quickstarts/nodejs-mongodb-persistent.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "labels": { - "template": "nodejs-mongo-persistent" + "template": "nodejs-mongo-persistent", + "app": "nodejs-mongo-persistent" }, "objects": [ { diff --git a/examples/quickstarts/nodejs-mongodb.json b/examples/quickstarts/nodejs-mongodb.json index 0649d6204ccb..cd5691c6b1a4 100644 --- a/examples/quickstarts/nodejs-mongodb.json +++ b/examples/quickstarts/nodejs-mongodb.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "labels": { - "template": "nodejs-mongodb-example" + "template": "nodejs-mongodb-example", + "app": "nodejs-mongodb-example" }, "objects": [ { diff --git a/examples/quickstarts/rails-postgresql-persistent.json b/examples/quickstarts/rails-postgresql-persistent.json index 3810ef727448..ae5344fb1d48 100644 --- a/examples/quickstarts/rails-postgresql-persistent.json +++ b/examples/quickstarts/rails-postgresql-persistent.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "labels": { - "template": "rails-pgsql-persistent" + "template": "rails-pgsql-persistent", + "app": "rails-pgsql-persistent" }, "objects": [ { diff --git a/examples/quickstarts/rails-postgresql.json b/examples/quickstarts/rails-postgresql.json index 3d8336c5a57c..a6475c1479c4 100644 --- a/examples/quickstarts/rails-postgresql.json +++ b/examples/quickstarts/rails-postgresql.json @@ -16,7 +16,8 @@ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "labels": { - "template": "rails-postgresql-example" + "template": "rails-postgresql-example", + "app": "rails-postgresql-example" }, "objects": [ { diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go index ae4b1c0a26e4..13a8f9eb9ea1 100644 --- a/pkg/oc/bootstrap/bindata.go +++ b/pkg/oc/bootstrap/bindata.go @@ -4738,6 +4738,9 @@ var _examplesJenkinsJenkinsEphemeralTemplateJson = []byte(`{ } }, "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", + "labels": { + "app": "jenkins-ephemeral" + }, "objects": [ { "kind": "Route", @@ -5039,6 +5042,9 @@ var _examplesJenkinsJenkinsPersistentTemplateJson = []byte(`{ } }, "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", + "labels": { + "app": "jenkins-persistent" + }, "objects": [ { "kind": "Route", @@ -6733,7 +6739,8 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-persistent" + "template": "cakephp-mysql-persistent", + "app": "cakephp-mysql-persistent" }, "objects": [ { @@ -7338,7 +7345,8 @@ var _examplesQuickstartsCakephpMysqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-example" + "template": "cakephp-mysql-example", + "app": "cakephp-mysql-example" }, "objects": [ { @@ -7917,7 +7925,8 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "labels": { - "template": "dancer-mysql-persistent" + "template": "dancer-mysql-persistent", + "app": "dancer-mysql-persistent" }, "objects": [ { @@ -8466,7 +8475,8 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "labels": { - "template": "dancer-mysql-example" + "template": "dancer-mysql-example", + "app": "dancer-mysql-example" }, "objects": [ { @@ -8989,7 +8999,8 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "labels": { - "template": "django-psql-persistent" + "template": "django-psql-persistent", + "app": "django-psql-persistent" }, "objects": [ { @@ -9548,7 +9559,8 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "labels": { - "template": "django-psql-example" + "template": "django-psql-example", + "app": "django-psql-example" }, "objects": [ { @@ -10081,7 +10093,8 @@ var _examplesQuickstartsHttpdJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/httpd-ex/blob/master/README.md.", "labels": { - "template": "httpd-example" + "template": "httpd-example", + "app": "httpd-example" }, "objects": [ { @@ -10374,7 +10387,8 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "labels": { - "template": "nodejs-mongo-persistent" + "template": "nodejs-mongo-persistent", + "app": "nodejs-mongo-persistent" }, "objects": [ { @@ -10942,7 +10956,8 @@ var _examplesQuickstartsNodejsMongodbJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "labels": { - "template": "nodejs-mongodb-example" + "template": "nodejs-mongodb-example", + "app": "nodejs-mongodb-example" }, "objects": [ { @@ -11486,7 +11501,8 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "labels": { - "template": "rails-pgsql-persistent" + "template": "rails-pgsql-persistent", + "app": "rails-pgsql-persistent" }, "objects": [ { @@ -12115,7 +12131,8 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "labels": { - "template": "rails-postgresql-example" + "template": "rails-postgresql-example", + "app": "rails-postgresql-example" }, "objects": [ { diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 5a8a87bf622f..242bd88ea3a3 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -18403,7 +18403,8 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-persistent" + "template": "cakephp-mysql-persistent", + "app": "cakephp-mysql-persistent" }, "objects": [ { @@ -19008,7 +19009,8 @@ var _examplesQuickstartsCakephpMysqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-example" + "template": "cakephp-mysql-example", + "app": "cakephp-mysql-example" }, "objects": [ { @@ -19587,7 +19589,8 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "labels": { - "template": "dancer-mysql-persistent" + "template": "dancer-mysql-persistent", + "app": "dancer-mysql-persistent" }, "objects": [ { @@ -20136,7 +20139,8 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "labels": { - "template": "dancer-mysql-example" + "template": "dancer-mysql-example", + "app": "dancer-mysql-example" }, "objects": [ { @@ -20659,7 +20663,8 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "labels": { - "template": "django-psql-persistent" + "template": "django-psql-persistent", + "app": "django-psql-persistent" }, "objects": [ { @@ -21218,7 +21223,8 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "labels": { - "template": "django-psql-example" + "template": "django-psql-example", + "app": "django-psql-example" }, "objects": [ { @@ -21751,7 +21757,8 @@ var _examplesQuickstartsHttpdJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/httpd-ex/blob/master/README.md.", "labels": { - "template": "httpd-example" + "template": "httpd-example", + "app": "httpd-example" }, "objects": [ { @@ -22044,7 +22051,8 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "labels": { - "template": "nodejs-mongo-persistent" + "template": "nodejs-mongo-persistent", + "app": "nodejs-mongo-persistent" }, "objects": [ { @@ -22612,7 +22620,8 @@ var _examplesQuickstartsNodejsMongodbJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "labels": { - "template": "nodejs-mongodb-example" + "template": "nodejs-mongodb-example", + "app": "nodejs-mongodb-example" }, "objects": [ { @@ -23156,7 +23165,8 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "labels": { - "template": "rails-pgsql-persistent" + "template": "rails-pgsql-persistent", + "app": "rails-pgsql-persistent" }, "objects": [ { @@ -23785,7 +23795,8 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "labels": { - "template": "rails-postgresql-example" + "template": "rails-postgresql-example", + "app": "rails-postgresql-example" }, "objects": [ { @@ -25477,6 +25488,9 @@ var _examplesJenkinsJenkinsEphemeralTemplateJson = []byte(`{ } }, "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", + "labels": { + "app": "jenkins-ephemeral" + }, "objects": [ { "kind": "Route", @@ -25778,6 +25792,9 @@ var _examplesJenkinsJenkinsPersistentTemplateJson = []byte(`{ } }, "message": "A Jenkins service has been created in your project. Log into Jenkins with your OpenShift account. The tutorial at https://github.com/openshift/origin/blob/master/examples/jenkins/README.md contains more information about using this template.", + "labels": { + "app": "jenkins-persistent" + }, "objects": [ { "kind": "Route", @@ -27472,7 +27489,8 @@ var _examplesQuickstartsCakephpMysqlJsonCakephpMysqlJson = []byte(`{ }, "message": "The following service(s) have been created in your project: ${NAME}, ${DATABASE_SERVICE_NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/cake-ex/blob/master/README.md.", "labels": { - "template": "cakephp-mysql-example" + "template": "cakephp-mysql-example", + "app": "cakephp-mysql-example" }, "objects": [ { From ffab00eda7b4b76baa9ebb0016d140d6ef33d451 Mon Sep 17 00:00:00 2001 From: gabemontero Date: Wed, 8 Nov 2017 15:05:07 -0500 Subject: [PATCH 2/2] clean up use of persistent in template display names (ux review) --- .../mariadb-persistent-template.json | 2 +- .../mongodb-persistent-template.json | 2 +- .../mysql-persistent-template.json | 2 +- .../postgresql-persistent-template.json | 2 +- .../redis-persistent-template.json | 2 +- .../jenkins/jenkins-persistent-template.json | 2 +- .../quickstarts/cakephp-mysql-persistent.json | 2 +- .../quickstarts/dancer-mysql-persistent.json | 2 +- .../django-postgresql-persistent.json | 2 +- .../nodejs-mongodb-persistent.json | 2 +- .../rails-postgresql-persistent.json | 2 +- pkg/oc/bootstrap/bindata.go | 22 +++++++++---------- test/extended/testdata/bindata.go | 22 +++++++++---------- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/examples/db-templates/mariadb-persistent-template.json b/examples/db-templates/mariadb-persistent-template.json index 217ef11dd741..92be8f42ec1d 100644 --- a/examples/db-templates/mariadb-persistent-template.json +++ b/examples/db-templates/mariadb-persistent-template.json @@ -4,7 +4,7 @@ "metadata": { "name": "mariadb-persistent", "annotations": { - "openshift.io/display-name": "MariaDB (Persistent)", + "openshift.io/display-name": "MariaDB", "description": "MariaDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mariadb", "tags": "database,mariadb", diff --git a/examples/db-templates/mongodb-persistent-template.json b/examples/db-templates/mongodb-persistent-template.json index 97e4128a489b..4e3e64d48d66 100644 --- a/examples/db-templates/mongodb-persistent-template.json +++ b/examples/db-templates/mongodb-persistent-template.json @@ -4,7 +4,7 @@ "metadata": { "name": "mongodb-persistent", "annotations": { - "openshift.io/display-name": "MongoDB (Persistent)", + "openshift.io/display-name": "MongoDB", "description": "MongoDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mongodb", "tags": "database,mongodb", diff --git a/examples/db-templates/mysql-persistent-template.json b/examples/db-templates/mysql-persistent-template.json index 48ac114fd4ea..6ac80f3a0132 100644 --- a/examples/db-templates/mysql-persistent-template.json +++ b/examples/db-templates/mysql-persistent-template.json @@ -4,7 +4,7 @@ "metadata": { "name": "mysql-persistent", "annotations": { - "openshift.io/display-name": "MySQL (Persistent)", + "openshift.io/display-name": "MySQL", "description": "MySQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mysql-database", "tags": "database,mysql", diff --git a/examples/db-templates/postgresql-persistent-template.json b/examples/db-templates/postgresql-persistent-template.json index 8a2d23907769..190509112d26 100644 --- a/examples/db-templates/postgresql-persistent-template.json +++ b/examples/db-templates/postgresql-persistent-template.json @@ -4,7 +4,7 @@ "metadata": { "name": "postgresql-persistent", "annotations": { - "openshift.io/display-name": "PostgreSQL (Persistent)", + "openshift.io/display-name": "PostgreSQL", "description": "PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-postgresql", "tags": "database,postgresql", diff --git a/examples/db-templates/redis-persistent-template.json b/examples/db-templates/redis-persistent-template.json index e0e0a88d5ea9..d1103d3afe40 100644 --- a/examples/db-templates/redis-persistent-template.json +++ b/examples/db-templates/redis-persistent-template.json @@ -4,7 +4,7 @@ "metadata": { "name": "redis-persistent", "annotations": { - "openshift.io/display-name": "Redis (Persistent)", + "openshift.io/display-name": "Redis", "description": "Redis in-memory data structure store, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-redis", "tags": "database,redis", diff --git a/examples/jenkins/jenkins-persistent-template.json b/examples/jenkins/jenkins-persistent-template.json index 264fa892f36e..59dc0d22b34e 100644 --- a/examples/jenkins/jenkins-persistent-template.json +++ b/examples/jenkins/jenkins-persistent-template.json @@ -4,7 +4,7 @@ "metadata": { "name": "jenkins-persistent", "annotations": { - "openshift.io/display-name": "Jenkins (Persistent)", + "openshift.io/display-name": "Jenkins", "description": "Jenkins service, with persistent storage.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-jenkins", "tags": "instant-app,jenkins", diff --git a/examples/quickstarts/cakephp-mysql-persistent.json b/examples/quickstarts/cakephp-mysql-persistent.json index 6594f5752203..e25ed3fedc9b 100644 --- a/examples/quickstarts/cakephp-mysql-persistent.json +++ b/examples/quickstarts/cakephp-mysql-persistent.json @@ -4,7 +4,7 @@ "metadata": { "name": "cakephp-mysql-persistent", "annotations": { - "openshift.io/display-name": "CakePHP + MySQL (Persistent)", + "openshift.io/display-name": "CakePHP + MySQL", "description": "An example CakePHP application with a MySQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/cakephp-ex/blob/master/README.md.", "tags": "quickstart,php,cakephp", "iconClass": "icon-php", diff --git a/examples/quickstarts/dancer-mysql-persistent.json b/examples/quickstarts/dancer-mysql-persistent.json index 232972af0a7d..2459a8fc4142 100644 --- a/examples/quickstarts/dancer-mysql-persistent.json +++ b/examples/quickstarts/dancer-mysql-persistent.json @@ -4,7 +4,7 @@ "metadata": { "name": "dancer-mysql-persistent", "annotations": { - "openshift.io/display-name": "Dancer + MySQL (Persistent)", + "openshift.io/display-name": "Dancer + MySQL", "description": "An example Dancer application with a MySQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "tags": "quickstart,perl,dancer", "iconClass": "icon-perl", diff --git a/examples/quickstarts/django-postgresql-persistent.json b/examples/quickstarts/django-postgresql-persistent.json index 970bd3088937..35536601fa84 100644 --- a/examples/quickstarts/django-postgresql-persistent.json +++ b/examples/quickstarts/django-postgresql-persistent.json @@ -4,7 +4,7 @@ "metadata": { "name": "django-psql-persistent", "annotations": { - "openshift.io/display-name": "Django + PostgreSQL (Persistent)", + "openshift.io/display-name": "Django + PostgreSQL", "description": "An example Django application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "tags": "quickstart,python,django", "iconClass": "icon-python", diff --git a/examples/quickstarts/nodejs-mongodb-persistent.json b/examples/quickstarts/nodejs-mongodb-persistent.json index ac0077ae994d..d28f2ccc35f9 100644 --- a/examples/quickstarts/nodejs-mongodb-persistent.json +++ b/examples/quickstarts/nodejs-mongodb-persistent.json @@ -4,7 +4,7 @@ "metadata": { "name": "nodejs-mongo-persistent", "annotations": { - "openshift.io/display-name": "Node.js + MongoDB (Persistent)", + "openshift.io/display-name": "Node.js + MongoDB", "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "tags": "quickstart,nodejs", "iconClass": "icon-nodejs", diff --git a/examples/quickstarts/rails-postgresql-persistent.json b/examples/quickstarts/rails-postgresql-persistent.json index ae5344fb1d48..df38f284a37c 100644 --- a/examples/quickstarts/rails-postgresql-persistent.json +++ b/examples/quickstarts/rails-postgresql-persistent.json @@ -4,7 +4,7 @@ "metadata": { "name": "rails-pgsql-persistent", "annotations": { - "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", + "openshift.io/display-name": "Rails + PostgreSQL", "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "tags": "quickstart,ruby,rails", "iconClass": "icon-ruby", diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go index 13a8f9eb9ea1..611581c196dd 100644 --- a/pkg/oc/bootstrap/bindata.go +++ b/pkg/oc/bootstrap/bindata.go @@ -2198,7 +2198,7 @@ var _examplesDbTemplatesMariadbPersistentTemplateJson = []byte(`{ "metadata": { "name": "mariadb-persistent", "annotations": { - "openshift.io/display-name": "MariaDB (Persistent)", + "openshift.io/display-name": "MariaDB", "description": "MariaDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mariadb", "tags": "database,mariadb", @@ -2775,7 +2775,7 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{ "metadata": { "name": "mongodb-persistent", "annotations": { - "openshift.io/display-name": "MongoDB (Persistent)", + "openshift.io/display-name": "MongoDB", "description": "MongoDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mongodb", "tags": "database,mongodb", @@ -3378,7 +3378,7 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{ "metadata": { "name": "mysql-persistent", "annotations": { - "openshift.io/display-name": "MySQL (Persistent)", + "openshift.io/display-name": "MySQL", "description": "MySQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mysql-database", "tags": "database,mysql", @@ -3943,7 +3943,7 @@ var _examplesDbTemplatesPostgresqlPersistentTemplateJson = []byte(`{ "metadata": { "name": "postgresql-persistent", "annotations": { - "openshift.io/display-name": "PostgreSQL (Persistent)", + "openshift.io/display-name": "PostgreSQL", "description": "PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-postgresql", "tags": "database,postgresql", @@ -4470,7 +4470,7 @@ var _examplesDbTemplatesRedisPersistentTemplateJson = []byte(`{ "metadata": { "name": "redis-persistent", "annotations": { - "openshift.io/display-name": "Redis (Persistent)", + "openshift.io/display-name": "Redis", "description": "Redis in-memory data structure store, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-redis", "tags": "database,redis", @@ -5031,7 +5031,7 @@ var _examplesJenkinsJenkinsPersistentTemplateJson = []byte(`{ "metadata": { "name": "jenkins-persistent", "annotations": { - "openshift.io/display-name": "Jenkins (Persistent)", + "openshift.io/display-name": "Jenkins", "description": "Jenkins service, with persistent storage.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-jenkins", "tags": "instant-app,jenkins", @@ -6727,7 +6727,7 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ "metadata": { "name": "cakephp-mysql-persistent", "annotations": { - "openshift.io/display-name": "CakePHP + MySQL (Persistent)", + "openshift.io/display-name": "CakePHP + MySQL", "description": "An example CakePHP application with a MySQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/cakephp-ex/blob/master/README.md.", "tags": "quickstart,php,cakephp", "iconClass": "icon-php", @@ -7913,7 +7913,7 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ "metadata": { "name": "dancer-mysql-persistent", "annotations": { - "openshift.io/display-name": "Dancer + MySQL (Persistent)", + "openshift.io/display-name": "Dancer + MySQL", "description": "An example Dancer application with a MySQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "tags": "quickstart,perl,dancer", "iconClass": "icon-perl", @@ -8987,7 +8987,7 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ "metadata": { "name": "django-psql-persistent", "annotations": { - "openshift.io/display-name": "Django + PostgreSQL (Persistent)", + "openshift.io/display-name": "Django + PostgreSQL", "description": "An example Django application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "tags": "quickstart,python,django", "iconClass": "icon-python", @@ -10375,7 +10375,7 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ "metadata": { "name": "nodejs-mongo-persistent", "annotations": { - "openshift.io/display-name": "Node.js + MongoDB (Persistent)", + "openshift.io/display-name": "Node.js + MongoDB", "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "tags": "quickstart,nodejs", "iconClass": "icon-nodejs", @@ -11489,7 +11489,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "metadata": { "name": "rails-pgsql-persistent", "annotations": { - "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", + "openshift.io/display-name": "Rails + PostgreSQL", "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "tags": "quickstart,ruby,rails", "iconClass": "icon-ruby", diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 242bd88ea3a3..085cc502b8a8 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -11849,7 +11849,7 @@ var _examplesDbTemplatesMariadbPersistentTemplateJson = []byte(`{ "metadata": { "name": "mariadb-persistent", "annotations": { - "openshift.io/display-name": "MariaDB (Persistent)", + "openshift.io/display-name": "MariaDB", "description": "MariaDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mariadb", "tags": "database,mariadb", @@ -12426,7 +12426,7 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{ "metadata": { "name": "mongodb-persistent", "annotations": { - "openshift.io/display-name": "MongoDB (Persistent)", + "openshift.io/display-name": "MongoDB", "description": "MongoDB database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mongodb", "tags": "database,mongodb", @@ -13029,7 +13029,7 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{ "metadata": { "name": "mysql-persistent", "annotations": { - "openshift.io/display-name": "MySQL (Persistent)", + "openshift.io/display-name": "MySQL", "description": "MySQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-mysql-database", "tags": "database,mysql", @@ -13594,7 +13594,7 @@ var _examplesDbTemplatesPostgresqlPersistentTemplateJson = []byte(`{ "metadata": { "name": "postgresql-persistent", "annotations": { - "openshift.io/display-name": "PostgreSQL (Persistent)", + "openshift.io/display-name": "PostgreSQL", "description": "PostgreSQL database service, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.\n\nNOTE: Scaling to more than one replica is not supported. You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-postgresql", "tags": "database,postgresql", @@ -14121,7 +14121,7 @@ var _examplesDbTemplatesRedisPersistentTemplateJson = []byte(`{ "metadata": { "name": "redis-persistent", "annotations": { - "openshift.io/display-name": "Redis (Persistent)", + "openshift.io/display-name": "Redis", "description": "Redis in-memory data structure store, with persistent storage. For more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-redis", "tags": "database,redis", @@ -18391,7 +18391,7 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ "metadata": { "name": "cakephp-mysql-persistent", "annotations": { - "openshift.io/display-name": "CakePHP + MySQL (Persistent)", + "openshift.io/display-name": "CakePHP + MySQL", "description": "An example CakePHP application with a MySQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/cakephp-ex/blob/master/README.md.", "tags": "quickstart,php,cakephp", "iconClass": "icon-php", @@ -19577,7 +19577,7 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ "metadata": { "name": "dancer-mysql-persistent", "annotations": { - "openshift.io/display-name": "Dancer + MySQL (Persistent)", + "openshift.io/display-name": "Dancer + MySQL", "description": "An example Dancer application with a MySQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/dancer-ex/blob/master/README.md.", "tags": "quickstart,perl,dancer", "iconClass": "icon-perl", @@ -20651,7 +20651,7 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ "metadata": { "name": "django-psql-persistent", "annotations": { - "openshift.io/display-name": "Django + PostgreSQL (Persistent)", + "openshift.io/display-name": "Django + PostgreSQL", "description": "An example Django application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "tags": "quickstart,python,django", "iconClass": "icon-python", @@ -22039,7 +22039,7 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ "metadata": { "name": "nodejs-mongo-persistent", "annotations": { - "openshift.io/display-name": "Node.js + MongoDB (Persistent)", + "openshift.io/display-name": "Node.js + MongoDB", "description": "An example Node.js application with a MongoDB database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/nodejs-ex/blob/master/README.md.", "tags": "quickstart,nodejs", "iconClass": "icon-nodejs", @@ -23153,7 +23153,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "metadata": { "name": "rails-pgsql-persistent", "annotations": { - "openshift.io/display-name": "Rails + PostgreSQL (Persistent)", + "openshift.io/display-name": "Rails + PostgreSQL", "description": "An example Rails application with a PostgreSQL database. For more information about using this template, including OpenShift considerations, see https://github.com/openshift/rails-ex/blob/master/README.md.", "tags": "quickstart,ruby,rails", "iconClass": "icon-ruby", @@ -25781,7 +25781,7 @@ var _examplesJenkinsJenkinsPersistentTemplateJson = []byte(`{ "metadata": { "name": "jenkins-persistent", "annotations": { - "openshift.io/display-name": "Jenkins (Persistent)", + "openshift.io/display-name": "Jenkins", "description": "Jenkins service, with persistent storage.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.", "iconClass": "icon-jenkins", "tags": "instant-app,jenkins",