add app label to example templates #17224

gabemontero · 2017-11-07T18:45:18Z

fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1503260

@openshift/sig-developer-experience fyi

/assign bparess

openshift-ci-robot · 2017-11-07T18:45:20Z

@gabemontero: GitHub didn't allow me to assign the following users: bparess.

Note that only openshift members can be assigned.

In response to this:

fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1503260

@openshift/sig-developer-experience fyi

/assign bparess

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

gabemontero · 2017-11-07T18:45:36Z

/assign @bparees

bparees · 2017-11-07T18:58:04Z

@gabemontero you'll need to follow this up with commits to the upstream quickstart templates (really you're supposed to change them there first and then import the changes here).

bparees · 2017-11-07T18:59:46Z

examples/db-templates/mariadb-ephemeral-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MYSQL_USER}\n       Password: ${MYSQL_PASSWORD}\n  Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.",
  "labels": {
-    "template": "mariadb-persistent-template"
+    "template": "mariadb-persistent-template",
+    "app": "mariadb-persistent-template"


we don't want "-template" in these labels. compare what "oc new-app" produces for the label when run w/ the template.

The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can. For example, if we want to spin up SonarQube, it needs an associated PostgreSQL DB instance and we want both the SonarQube instance and the PostgreSQL instance to have the same app label.

bparees · 2017-11-07T19:00:37Z

also i think the app label value needs to be a parameter.

bparees · 2017-11-07T19:00:53Z

(ok so the fruit wasn't that low hanging)

InfoSec812 · 2017-11-07T19:11:56Z

examples/db-templates/mariadb-persistent-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MYSQL_USER}\n       Password: ${MYSQL_PASSWORD}\n  Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/blob/master/10.1/README.md.",
  "labels": {
-    "template": "mariadb-persistent-template"
+    "template": "mariadb-persistent-template",
+    "app": "mariadb-persistent-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:01Z

examples/db-templates/mongodb-ephemeral-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MONGODB_USER}\n       Password: ${MONGODB_PASSWORD}\n  Database Name: ${MONGODB_DATABASE}\n Connection URL: mongodb://${MONGODB_USER}:${MONGODB_PASSWORD}@${DATABASE_SERVICE_NAME}/${MONGODB_DATABASE}\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.",
  "labels": {
-    "template": "mongodb-ephemeral-template"
+    "template": "mongodb-ephemeral-template",
+    "app": "mongodb-ephemeral-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:08Z

examples/db-templates/mongodb-persistent-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MONGODB_USER}\n       Password: ${MONGODB_PASSWORD}\n  Database Name: ${MONGODB_DATABASE}\n Connection URL: mongodb://${MONGODB_USER}:${MONGODB_PASSWORD}@${DATABASE_SERVICE_NAME}/${MONGODB_DATABASE}\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.",
  "labels": {
-    "template": "mongodb-persistent-template"
+    "template": "mongodb-persistent-template",
+    "app": "mongodb-persistent-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:14Z

examples/db-templates/mysql-ephemeral-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MYSQL_USER}\n       Password: ${MYSQL_PASSWORD}\n  Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.",
  "labels": {
-    "template": "mysql-ephemeral-template"
+    "template": "mysql-ephemeral-template",
+    "app": "mysql-ephemeral-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:19Z

examples/db-templates/mysql-persistent-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MYSQL_USER}\n       Password: ${MYSQL_PASSWORD}\n  Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.",
  "labels": {
-    "template": "mysql-persistent-template"
+    "template": "mysql-persistent-template",
+    "app": "mysql-persistent-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:24Z

examples/db-templates/postgresql-ephemeral-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${POSTGRESQL_USER}\n       Password: ${POSTGRESQL_PASSWORD}\n  Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.",
  "labels": {
-    "template": "postgresql-ephemeral-template"
+    "template": "postgresql-ephemeral-template",
+    "app": "postgresql-ephemeral-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:31Z

examples/db-templates/postgresql-persistent-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${POSTGRESQL_USER}\n       Password: ${POSTGRESQL_PASSWORD}\n  Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.",
  "labels": {
-    "template": "postgresql-persistent-template"
+    "template": "postgresql-persistent-template",
+    "app": "postgresql-persistent-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:37Z

examples/db-templates/redis-ephemeral-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Password: ${REDIS_PASSWORD}\n Connection URL: redis://${DATABASE_SERVICE_NAME}:6379/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.",
  "labels": {
-    "template": "redis-ephemeral-template"
+    "template": "redis-ephemeral-template",
+    "app": "redis-ephemeral-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:42Z

examples/db-templates/redis-persistent-template.json

@@ -16,7 +16,8 @@
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Password: ${REDIS_PASSWORD}\n Connection URL: redis://${DATABASE_SERVICE_NAME}:6379/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.",
  "labels": {
-    "template": "redis-persistent-template"
+    "template": "redis-persistent-template",
+    "app": "redis-persistent-template"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:12:50Z

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"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:13:02Z

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"


The app label should be parameterized so that when a DB template is used with another application and we want to associate it with that app we can.

InfoSec812 · 2017-11-07T19:13:47Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:13:56Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:02Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:10Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:21Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:26Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:32Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:36Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:14:43Z

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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:17:35Z

test/extended/testdata/bindata.go

@@ -12149,7 +12151,8 @@ var _examplesDbTemplatesMongodbEphemeralTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MONGODB_USER}\n       Password: ${MONGODB_PASSWORD}\n  Database Name: ${MONGODB_DATABASE}\n Connection URL: mongodb://${MONGODB_USER}:${MONGODB_PASSWORD}@${DATABASE_SERVICE_NAME}/${MONGODB_DATABASE}\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.",
  "labels": {
-    "template": "mongodb-ephemeral-template"
+    "template": "mongodb-ephemeral-template",
+    "app": "mongodb-ephemeral-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

gabemontero · 2017-11-07T19:17:39Z

On Tue, Nov 7, 2017 at 2:01 PM, Ben Parees ***@***.***> wrote: (ok so the fruit wasn't that low hanging)

So do you want this in 3.7, or post 3.7 @bparees ?

…

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#17224 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ADbadE1cOunnmddeV2cmV1V8tHejY9HYks5s0Kj0gaJpZM4QVQy_> .

InfoSec812 · 2017-11-07T19:17:39Z

test/extended/testdata/bindata.go

@@ -12438,7 +12441,8 @@ var _examplesDbTemplatesMongodbPersistentTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MONGODB_USER}\n       Password: ${MONGODB_PASSWORD}\n  Database Name: ${MONGODB_DATABASE}\n Connection URL: mongodb://${MONGODB_USER}:${MONGODB_PASSWORD}@${DATABASE_SERVICE_NAME}/${MONGODB_DATABASE}\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mongodb-container/blob/master/3.2/README.md.",
  "labels": {
-    "template": "mongodb-persistent-template"
+    "template": "mongodb-persistent-template",
+    "app": "mongodb-persistent-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:17:45Z

test/extended/testdata/bindata.go

@@ -12751,7 +12755,8 @@ var _examplesDbTemplatesMysqlEphemeralTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MYSQL_USER}\n       Password: ${MYSQL_PASSWORD}\n  Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.",
  "labels": {
-    "template": "mysql-ephemeral-template"
+    "template": "mysql-ephemeral-template",
+    "app": "mysql-ephemeral-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:17:49Z

test/extended/testdata/bindata.go

@@ -13041,7 +13046,8 @@ var _examplesDbTemplatesMysqlPersistentTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${MYSQL_USER}\n       Password: ${MYSQL_PASSWORD}\n  Database Name: ${MYSQL_DATABASE}\n Connection URL: mysql://${DATABASE_SERVICE_NAME}:3306/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/mysql-container/blob/master/5.7/README.md.",
  "labels": {
-    "template": "mysql-persistent-template"
+    "template": "mysql-persistent-template",
+    "app": "mysql-persistent-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:17:54Z

test/extended/testdata/bindata.go

@@ -13336,7 +13342,8 @@ var _examplesDbTemplatesPostgresqlEphemeralTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${POSTGRESQL_USER}\n       Password: ${POSTGRESQL_PASSWORD}\n  Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.",
  "labels": {
-    "template": "postgresql-ephemeral-template"
+    "template": "postgresql-ephemeral-template",
+    "app": "postgresql-ephemeral-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:18:01Z

test/extended/testdata/bindata.go

@@ -13606,7 +13613,8 @@ var _examplesDbTemplatesPostgresqlPersistentTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Username: ${POSTGRESQL_USER}\n       Password: ${POSTGRESQL_PASSWORD}\n  Database Name: ${POSTGRESQL_DATABASE}\n Connection URL: postgresql://${DATABASE_SERVICE_NAME}:5432/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/9.5.",
  "labels": {
-    "template": "postgresql-persistent-template"
+    "template": "postgresql-persistent-template",
+    "app": "postgresql-persistent-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:18:06Z

test/extended/testdata/bindata.go

@@ -13900,7 +13908,8 @@ var _examplesDbTemplatesRedisEphemeralTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Password: ${REDIS_PASSWORD}\n Connection URL: redis://${DATABASE_SERVICE_NAME}:6379/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.",
  "labels": {
-    "template": "redis-ephemeral-template"
+    "template": "redis-ephemeral-template",
+    "app": "redis-ephemeral-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:18:11Z

test/extended/testdata/bindata.go

@@ -14133,7 +14142,8 @@ var _examplesDbTemplatesRedisPersistentTemplateJson = []byte(`{
  },
  "message": "The following service(s) have been created in your project: ${DATABASE_SERVICE_NAME}.\n\n       Password: ${REDIS_PASSWORD}\n Connection URL: redis://${DATABASE_SERVICE_NAME}:6379/\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/sclorg/redis-container/blob/master/3.2.",
  "labels": {
-    "template": "redis-persistent-template"
+    "template": "redis-persistent-template",
+    "app": "redis-persistent-template"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:15Z

test/extended/testdata/bindata.go

@@ -18403,7 +18413,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:19Z

test/extended/testdata/bindata.go

@@ -19008,7 +19019,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:23Z

test/extended/testdata/bindata.go

@@ -19587,7 +19599,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:28Z

test/extended/testdata/bindata.go

@@ -20136,7 +20149,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812

Please ensure that the app label is parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:32Z

test/extended/testdata/bindata.go

@@ -20659,7 +20673,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:40Z

test/extended/testdata/bindata.go

@@ -21218,7 +21233,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:44Z

test/extended/testdata/bindata.go

@@ -21751,7 +21767,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:48Z

test/extended/testdata/bindata.go

@@ -22044,7 +22061,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:54Z

test/extended/testdata/bindata.go

@@ -22612,7 +22630,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:19:58Z

test/extended/testdata/bindata.go

@@ -23156,7 +23175,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:20:03Z

test/extended/testdata/bindata.go

@@ -23785,7 +23805,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:20:12Z

test/extended/testdata/bindata.go

@@ -25477,6 +25498,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:20:17Z

test/extended/testdata/bindata.go

@@ -25778,6 +25802,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

InfoSec812 · 2017-11-07T19:20:22Z

test/extended/testdata/bindata.go

@@ -27472,7 +27499,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"


The app label should be parameterized so that when templates are used in conjunction to form a single application we can make the app labels match.

gabemontero · 2017-11-08T16:33:58Z

OK after a pow-wow with @bparees (who similarly had a pow-wow with @smarterclayton ), the net is

we are not updating oc process to add labels ... keeping it "pure"
we'll using template name for label value, not the value of the template label
we'll parameterize as previously requested by multiple folks
while we'll do the quickstarts and jenkins, we will NOT do the db's

gabemontero · 2017-11-08T17:11:59Z

Another update ... turns out, we cannot parameterize the template labels yet ... @jim-minter has #16605 which will allow this, but that is prioritized for 3.8.

@bparees has directed me to ditch the parameters for now with this pull. We'll see about updating the templates to use parameters in 3.8 once #16605 has merged.

gabemontero · 2017-11-08T17:57:01Z

And of course you can override the app label with the -l option on oc new-app or oc process

gabemontero · 2017-11-08T20:06:38Z

OK, I've pushed updates per recent discussion, as well as did some display name clean up per a side request from @jwforres

bparees · 2017-11-08T21:18:51Z

/lgtm

@gabemontero please follow this up w/ changes to the upstream quickstart templates in the various example repos.

openshift-merge-robot · 2017-11-08T21:18:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, gabemontero

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

~~examples/db-templates/OWNERS~~ [bparees]
~~examples/jenkins/OWNERS~~ [bparees]
~~examples/quickstarts/OWNERS~~ [bparees]
~~pkg/oc/bootstrap/OWNERS~~ [bparees]
~~test/extended/OWNERS~~ [bparees]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

openshift-bot · 2017-11-09T00:52:19Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-merge-robot · 2017-11-09T04:01:04Z

Automatic merge from submit-queue.

openshift-merge-robot assigned spadgett and mfojtik Nov 7, 2017

openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 7, 2017

openshift-ci-robot assigned bparees Nov 7, 2017

bparees reviewed Nov 7, 2017

View reviewed changes

InfoSec812 reviewed Nov 7, 2017

View reviewed changes

InfoSec812 suggested changes Nov 7, 2017

View reviewed changes

gabemontero added 2 commits November 8, 2017 14:59

add app label to quickstart, jenkins templates

c408ca8

clean up use of persistent in template display names (ux review)

ffab00e

gabemontero force-pushed the template-app-label branch from e94b76e to ffab00e Compare November 8, 2017 20:05

bparees added the kind/bug Categorizes issue or PR as related to a bug. label Nov 8, 2017

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 8, 2017

openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 8, 2017

openshift-merge-robot merged commit 50a59f3 into openshift:master Nov 9, 2017

gabemontero deleted the template-app-label branch November 9, 2017 15:12

add app label to example templates #17224

add app label to example templates #17224

Conversation

gabemontero commented Nov 7, 2017

openshift-ci-robot commented Nov 7, 2017

gabemontero commented Nov 7, 2017

bparees commented Nov 7, 2017

Choose a reason for hiding this comment

InfoSec812 Nov 7, 2017 • edited Loading

Choose a reason for hiding this comment

bparees commented Nov 7, 2017

bparees commented Nov 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabemontero commented Nov 7, 2017 via email

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

InfoSec812 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabemontero commented Nov 8, 2017

gabemontero commented Nov 8, 2017

gabemontero commented Nov 8, 2017

gabemontero commented Nov 8, 2017

bparees commented Nov 8, 2017

openshift-merge-robot commented Nov 8, 2017

openshift-bot commented Nov 9, 2017

openshift-merge-robot commented Nov 9, 2017

InfoSec812 Nov 7, 2017 •

edited

Loading