Skip to content

Commit

Permalink
Merge pull request #17224 from gabemontero/template-app-label
Browse files Browse the repository at this point in the history
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
  • Loading branch information
openshift-merge-robot authored Nov 9, 2017
2 parents 0bee69f + ffab00e commit 50a59f3
Show file tree
Hide file tree
Showing 20 changed files with 119 additions and 67 deletions.
2 changes: 1 addition & 1 deletion examples/db-templates/mariadb-persistent-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/db-templates/mongodb-persistent-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/db-templates/mysql-persistent-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/db-templates/postgresql-persistent-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion examples/db-templates/redis-persistent-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions examples/jenkins/jenkins-ephemeral-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 4 additions & 1 deletion examples/jenkins/jenkins-persistent-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions examples/quickstarts/cakephp-mysql-persistent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -17,7 +17,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": [
{
Expand Down
3 changes: 2 additions & 1 deletion examples/quickstarts/cakephp-mysql.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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": [
{
Expand Down
5 changes: 3 additions & 2 deletions examples/quickstarts/dancer-mysql-persistent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -17,7 +17,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": [
{
Expand Down
3 changes: 2 additions & 1 deletion examples/quickstarts/dancer-mysql.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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": [
{
Expand Down
5 changes: 3 additions & 2 deletions examples/quickstarts/django-postgresql-persistent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -17,7 +17,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": [
{
Expand Down
3 changes: 2 additions & 1 deletion examples/quickstarts/django-postgresql.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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": [
{
Expand Down
3 changes: 2 additions & 1 deletion examples/quickstarts/httpd.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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": [
{
Expand Down
5 changes: 3 additions & 2 deletions examples/quickstarts/nodejs-mongodb-persistent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -17,7 +17,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": [
{
Expand Down
3 changes: 2 additions & 1 deletion examples/quickstarts/nodejs-mongodb.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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": [
{
Expand Down
5 changes: 3 additions & 2 deletions examples/quickstarts/rails-postgresql-persistent.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -17,7 +17,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": [
{
Expand Down
3 changes: 2 additions & 1 deletion examples/quickstarts/rails-postgresql.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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": [
{
Expand Down
Loading

0 comments on commit 50a59f3

Please sign in to comment.