Skip to content

Commit 50a59f3

Browse files
Merge pull request #17224 from gabemontero/template-app-label
Automatic merge from submit-queue. add app label to example templates fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=1503260 @openshift/sig-developer-experience fyi /assign bparess
2 parents 0bee69f + ffab00e commit 50a59f3

20 files changed

+119
-67
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "mariadb-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "MariaDB (Persistent)",
7+
"openshift.io/display-name": "MariaDB",
88
"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.",
99
"iconClass": "icon-mariadb",
1010
"tags": "database,mariadb",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "mongodb-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "MongoDB (Persistent)",
7+
"openshift.io/display-name": "MongoDB",
88
"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.",
99
"iconClass": "icon-mongodb",
1010
"tags": "database,mongodb",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "mysql-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "MySQL (Persistent)",
7+
"openshift.io/display-name": "MySQL",
88
"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.",
99
"iconClass": "icon-mysql-database",
1010
"tags": "database,mysql",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "postgresql-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "PostgreSQL (Persistent)",
7+
"openshift.io/display-name": "PostgreSQL",
88
"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.",
99
"iconClass": "icon-postgresql",
1010
"tags": "database,postgresql",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "redis-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "Redis (Persistent)",
7+
"openshift.io/display-name": "Redis",
88
"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.",
99
"iconClass": "icon-redis",
1010
"tags": "database,redis",

examples/jenkins/jenkins-ephemeral-template.json

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
}
1616
},
1717
"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.",
18+
"labels": {
19+
"app": "jenkins-ephemeral"
20+
},
1821
"objects": [
1922
{
2023
"kind": "Route",

examples/jenkins/jenkins-persistent-template.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "jenkins-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "Jenkins (Persistent)",
7+
"openshift.io/display-name": "Jenkins",
88
"description": "Jenkins service, with persistent storage.\n\nNOTE: You must have persistent volumes available in your cluster to use this template.",
99
"iconClass": "icon-jenkins",
1010
"tags": "instant-app,jenkins",
@@ -15,6 +15,9 @@
1515
}
1616
},
1717
"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.",
18+
"labels": {
19+
"app": "jenkins-persistent"
20+
},
1821
"objects": [
1922
{
2023
"kind": "Route",

examples/quickstarts/cakephp-mysql-persistent.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "cakephp-mysql-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "CakePHP + MySQL (Persistent)",
7+
"openshift.io/display-name": "CakePHP + MySQL",
88
"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.",
99
"tags": "quickstart,php,cakephp",
1010
"iconClass": "icon-php",
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "cakephp-mysql-persistent"
20+
"template": "cakephp-mysql-persistent",
21+
"app": "cakephp-mysql-persistent"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/cakephp-mysql.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "cakephp-mysql-example"
20+
"template": "cakephp-mysql-example",
21+
"app": "cakephp-mysql-example"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/dancer-mysql-persistent.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "dancer-mysql-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "Dancer + MySQL (Persistent)",
7+
"openshift.io/display-name": "Dancer + MySQL",
88
"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.",
99
"tags": "quickstart,perl,dancer",
1010
"iconClass": "icon-perl",
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "dancer-mysql-persistent"
20+
"template": "dancer-mysql-persistent",
21+
"app": "dancer-mysql-persistent"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/dancer-mysql.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "dancer-mysql-example"
20+
"template": "dancer-mysql-example",
21+
"app": "dancer-mysql-example"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/django-postgresql-persistent.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "django-psql-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "Django + PostgreSQL (Persistent)",
7+
"openshift.io/display-name": "Django + PostgreSQL",
88
"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.",
99
"tags": "quickstart,python,django",
1010
"iconClass": "icon-python",
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "django-psql-persistent"
20+
"template": "django-psql-persistent",
21+
"app": "django-psql-persistent"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/django-postgresql.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "django-psql-example"
20+
"template": "django-psql-example",
21+
"app": "django-psql-example"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/httpd.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "httpd-example"
20+
"template": "httpd-example",
21+
"app": "httpd-example"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/nodejs-mongodb-persistent.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "nodejs-mongo-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "Node.js + MongoDB (Persistent)",
7+
"openshift.io/display-name": "Node.js + MongoDB",
88
"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.",
99
"tags": "quickstart,nodejs",
1010
"iconClass": "icon-nodejs",
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "nodejs-mongo-persistent"
20+
"template": "nodejs-mongo-persistent",
21+
"app": "nodejs-mongo-persistent"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/nodejs-mongodb.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "nodejs-mongodb-example"
20+
"template": "nodejs-mongodb-example",
21+
"app": "nodejs-mongodb-example"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/rails-postgresql-persistent.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"metadata": {
55
"name": "rails-pgsql-persistent",
66
"annotations": {
7-
"openshift.io/display-name": "Rails + PostgreSQL (Persistent)",
7+
"openshift.io/display-name": "Rails + PostgreSQL",
88
"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.",
99
"tags": "quickstart,ruby,rails",
1010
"iconClass": "icon-ruby",
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "rails-pgsql-persistent"
20+
"template": "rails-pgsql-persistent",
21+
"app": "rails-pgsql-persistent"
2122
},
2223
"objects": [
2324
{

examples/quickstarts/rails-postgresql.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"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.",
1919
"labels": {
20-
"template": "rails-postgresql-example"
20+
"template": "rails-postgresql-example",
21+
"app": "rails-postgresql-example"
2122
},
2223
"objects": [
2324
{

0 commit comments

Comments
 (0)