diff --git a/examples/quickstarts/cakephp-mysql-persistent.json b/examples/quickstarts/cakephp-mysql-persistent.json index a8b90a493009..86ddc184acb9 100644 --- a/examples/quickstarts/cakephp-mysql-persistent.json +++ b/examples/quickstarts/cakephp-mysql-persistent.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -60,10 +61,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/cakephp-mysql.json b/examples/quickstarts/cakephp-mysql.json index e8439739425d..3c964bd6add2 100644 --- a/examples/quickstarts/cakephp-mysql.json +++ b/examples/quickstarts/cakephp-mysql.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -60,10 +61,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/dancer-mysql-persistent.json b/examples/quickstarts/dancer-mysql-persistent.json index 96048f200a63..0a10c5fbc107 100644 --- a/examples/quickstarts/dancer-mysql-persistent.json +++ b/examples/quickstarts/dancer-mysql-persistent.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a Dancer based application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/dancer-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -58,10 +59,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/dancer-mysql.json b/examples/quickstarts/dancer-mysql.json index 1c87e05f38c9..6122d543680e 100644 --- a/examples/quickstarts/dancer-mysql.json +++ b/examples/quickstarts/dancer-mysql.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a Dancer based application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/dancer-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -58,10 +59,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/django-postgresql-persistent.json b/examples/quickstarts/django-postgresql-persistent.json index 060f45daccf6..f3b5838fa17c 100644 --- a/examples/quickstarts/django-postgresql-persistent.json +++ b/examples/quickstarts/django-postgresql-persistent.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a Django based application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/django-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -58,10 +59,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/django-postgresql.json b/examples/quickstarts/django-postgresql.json index 66f2f0ca1221..b21295df2d43 100644 --- a/examples/quickstarts/django-postgresql.json +++ b/examples/quickstarts/django-postgresql.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a Django based application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/django-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -58,10 +59,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/httpd.json b/examples/quickstarts/httpd.json index ebba9ee65ca6..3771280bf1c1 100644 --- a/examples/quickstarts/httpd.json +++ b/examples/quickstarts/httpd.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a static application served by Apache HTTP Server (httpd), including a build configuration and application deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/httpd-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -45,10 +46,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/nodejs-mongodb-persistent.json b/examples/quickstarts/nodejs-mongodb-persistent.json index 9543b56812fc..7f2a5d80468f 100644 --- a/examples/quickstarts/nodejs-mongodb-persistent.json +++ b/examples/quickstarts/nodejs-mongodb-persistent.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -58,10 +59,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/nodejs-mongodb.json b/examples/quickstarts/nodejs-mongodb.json index 0649d6204ccb..b3afae46e3ef 100644 --- a/examples/quickstarts/nodejs-mongodb.json +++ b/examples/quickstarts/nodejs-mongodb.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -58,10 +59,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/rails-postgresql-persistent.json b/examples/quickstarts/rails-postgresql-persistent.json index 3810ef727448..1c03be28a6b7 100644 --- a/examples/quickstarts/rails-postgresql-persistent.json +++ b/examples/quickstarts/rails-postgresql-persistent.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/rails-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -23,11 +24,7 @@ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-username": "{.data['application-user']}", - "template.openshift.io/expose-password": "{.data['application-password']}" - } + "name": "${NAME}" }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -64,10 +61,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/examples/quickstarts/rails-postgresql.json b/examples/quickstarts/rails-postgresql.json index 3d8336c5a57c..240289d331d8 100644 --- a/examples/quickstarts/rails-postgresql.json +++ b/examples/quickstarts/rails-postgresql.json @@ -11,7 +11,8 @@ "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/rails-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -23,11 +24,7 @@ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-username": "{.data['application-user']}", - "template.openshift.io/expose-password": "{.data['application-password']}" - } + "name": "${NAME}" }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -64,10 +61,7 @@ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go index ae4b1c0a26e4..71b4cc02fa3c 100644 --- a/pkg/oc/bootstrap/bindata.go +++ b/pkg/oc/bootstrap/bindata.go @@ -6728,7 +6728,8 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -6777,10 +6778,7 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -7333,7 +7331,8 @@ var _examplesQuickstartsCakephpMysqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -7382,10 +7381,7 @@ var _examplesQuickstartsCakephpMysqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -7912,7 +7908,8 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Dancer based application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/dancer-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -7959,10 +7956,7 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -8461,7 +8455,8 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Dancer based application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/dancer-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -8508,10 +8503,7 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -8984,7 +8976,8 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Django based application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/django-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -9031,10 +9024,7 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -9543,7 +9533,8 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Django based application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/django-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -9590,10 +9581,7 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -10076,7 +10064,8 @@ var _examplesQuickstartsHttpdJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a static application served by Apache HTTP Server (httpd), including a build configuration and application deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/httpd-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -10110,10 +10099,7 @@ var _examplesQuickstartsHttpdJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -10369,7 +10355,8 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -10416,10 +10403,7 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -10937,7 +10921,8 @@ var _examplesQuickstartsNodejsMongodbJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -10984,10 +10969,7 @@ var _examplesQuickstartsNodejsMongodbJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -11481,7 +11463,8 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/rails-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -11493,11 +11476,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-username": "{.data['application-user']}", - "template.openshift.io/expose-password": "{.data['application-password']}" - } + "name": "${NAME}" }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -11534,10 +11513,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -12110,7 +12086,8 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/rails-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -12122,11 +12099,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-username": "{.data['application-user']}", - "template.openshift.io/expose-password": "{.data['application-password']}" - } + "name": "${NAME}" }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -12163,10 +12136,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", diff --git a/pkg/template/apis/template/constants.go b/pkg/template/apis/template/constants.go index 42012137a173..9445d2b11259 100644 --- a/pkg/template/apis/template/constants.go +++ b/pkg/template/apis/template/constants.go @@ -35,4 +35,8 @@ const ( // should wait for the object to be ready before reporting the template // instantiation complete. WaitForReadyAnnotation = "template.alpha.openshift.io/wait-for-ready" + + // BindableAnnotation indicates whether the template service broker should + // advertise the template as being bindable (default is true) + BindableAnnotation = "template.openshift.io/bindable" ) diff --git a/pkg/templateservicebroker/servicebroker/bind.go b/pkg/templateservicebroker/servicebroker/bind.go index 5d3a4755888b..9ff36a20c06f 100644 --- a/pkg/templateservicebroker/servicebroker/bind.go +++ b/pkg/templateservicebroker/servicebroker/bind.go @@ -178,6 +178,9 @@ func (b *Broker) Bind(u user.Info, instanceID, bindingID string, breq *api.BindR if breq.ServiceID != string(templateInstance.Spec.Template.UID) { return api.BadRequest(errors.New("service_id does not match provisioned service")) } + if strings.ToLower(templateInstance.Spec.Template.Annotations[templateapi.BindableAnnotation]) == "false" { + return api.BadRequest(errors.New("provisioned service is not bindable")) + } credentials := map[string]interface{}{} diff --git a/pkg/templateservicebroker/servicebroker/catalog.go b/pkg/templateservicebroker/servicebroker/catalog.go index 1cd19d0e722a..7bcd16a980f8 100644 --- a/pkg/templateservicebroker/servicebroker/catalog.go +++ b/pkg/templateservicebroker/servicebroker/catalog.go @@ -55,12 +55,14 @@ func serviceFromTemplate(template *templateapi.Template) *api.Service { paramOrdering = append(paramOrdering, param.Name) } + bindable := strings.ToLower(template.Annotations[templateapi.BindableAnnotation]) != "false" + plan := api.Plan{ ID: string(template.UID), // TODO: this should be a unique value Name: "default", Description: "Default plan", Free: true, - Bindable: true, + Bindable: bindable, Schemas: api.Schema{ ServiceInstance: api.ServiceInstances{ Create: map[string]*jsschema.Schema{ @@ -106,7 +108,7 @@ func serviceFromTemplate(template *templateapi.Template) *api.Service { ID: string(template.UID), Description: description, Tags: strings.Split(template.Annotations["tags"], ","), - Bindable: true, + Bindable: bindable, Metadata: metadata, Plans: []api.Plan{plan}, } diff --git a/pkg/templateservicebroker/servicebroker/catalog_test.go b/pkg/templateservicebroker/servicebroker/catalog_test.go index db7dd8675c8b..54d8997ea89e 100644 --- a/pkg/templateservicebroker/servicebroker/catalog_test.go +++ b/pkg/templateservicebroker/servicebroker/catalog_test.go @@ -135,8 +135,15 @@ func TestServiceFromTemplate(t *testing.T) { } template.Annotations["description"] = "" + template.Annotations[templateapi.BindableAnnotation] = "False" service = serviceFromTemplate(template) if service.Description != noDescriptionProvided { t.Errorf("service.Description incorrectly set to %q", service.Description) } + if service.Bindable { + t.Errorf("service.Bindable incorrectly set") + } + if service.Plans[0].Bindable { + t.Errorf("service.Plans[0].Bindable incorrectly set") + } } diff --git a/pkg/templateservicebroker/servicebroker/unbind.go b/pkg/templateservicebroker/servicebroker/unbind.go index 1fb717dcc99b..da279e6e79b4 100644 --- a/pkg/templateservicebroker/servicebroker/unbind.go +++ b/pkg/templateservicebroker/servicebroker/unbind.go @@ -1,7 +1,9 @@ package servicebroker import ( + "errors" "net/http" + "strings" "github.com/golang/glog" @@ -41,6 +43,14 @@ func (b *Broker) Unbind(u user.Info, instanceID, bindingID string) *api.Response return api.Forbidden(err) } + templateInstance, err := b.templateclient.TemplateInstances(namespace).Get(brokerTemplateInstance.Spec.TemplateInstance.Name, metav1.GetOptions{}) + if err != nil { + return api.InternalServerError(err) + } + if strings.ToLower(templateInstance.Spec.Template.Annotations[templateapi.BindableAnnotation]) == "false" { + return api.BadRequest(errors.New("provisioned service is not bindable")) + } + // The OSB API requires this function to be idempotent (restartable). If // any actual change was made, per the spec, StatusOK is returned, else // StatusGone. diff --git a/test/extended/setup.sh b/test/extended/setup.sh index 882f45c46fb7..293a64311a54 100644 --- a/test/extended/setup.sh +++ b/test/extended/setup.sh @@ -148,6 +148,9 @@ function os::test::extended::setup () { os::log::info "Creating quickstart templates" oc create -n openshift -f "${OS_ROOT}/examples/quickstarts" --config="${ADMIN_KUBECONFIG}" + + os::log::info "Creating db-templates templates" + oc create -n openshift -f "${OS_ROOT}/examples/db-templates" --config="${ADMIN_KUBECONFIG}" } # Run extended tests or print out a list of tests that need to be run diff --git a/test/extended/templates/templateservicebroker_e2e.go b/test/extended/templates/templateservicebroker_e2e.go index 6cf0003ce190..7359d16af663 100644 --- a/test/extended/templates/templateservicebroker_e2e.go +++ b/test/extended/templates/templateservicebroker_e2e.go @@ -64,7 +64,7 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te cliUser = &user.DefaultInfo{Name: cli.Username(), Groups: []string{"system:authenticated"}} // should have been created before the extended test runs - template, err = cli.TemplateClient().Template().Templates("openshift").Get("cakephp-mysql-example", metav1.GetOptions{}) + template, err = cli.TemplateClient().Template().Templates("openshift").Get("mysql-ephemeral", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) processedtemplate, err = internalversion.NewTemplateProcessorClient(cli.AdminTemplateClient().Template().RESTClient(), "openshift").Process(template) @@ -155,17 +155,17 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te Namespace: cli.Namespace(), }, Parameters: map[string]string{ - "DATABASE_USER": "test", + "MYSQL_USER": "test", }, }) if err != nil { templateInstance, err := cli.TemplateClient().Template().TemplateInstances(cli.Namespace()).Get(instanceID, metav1.GetOptions{}) if err != nil { - fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v", err) + fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v\n", err) } else { err := dumpObjectReadiness(cli, templateInstance) if err != nil { - fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v", err) + fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v\n", err) } } } @@ -237,10 +237,10 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te })) o.Expect(secret.Type).To(o.Equal(v1.SecretTypeOpaque)) o.Expect(secret.Data).To(o.Equal(map[string][]byte{ - "DATABASE_USER": []byte("test"), + "MYSQL_USER": []byte("test"), })) - examplesecret, err := cli.KubeClient().CoreV1().Secrets(cli.Namespace()).Get("cakephp-mysql-example", metav1.GetOptions{}) + examplesecret, err := cli.KubeClient().CoreV1().Secrets(cli.Namespace()).Get("mysql", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(examplesecret.OwnerReferences).To(o.ContainElement(metav1.OwnerReference{ @@ -268,7 +268,7 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te o.Expect(brokerTemplateInstance.Spec.BindingIDs).To(o.Equal([]string{bindingID})) o.Expect(bind.Credentials).To(o.HaveKey("uri")) - o.Expect(bind.Credentials["uri"]).To(o.HavePrefix("http://")) + o.Expect(bind.Credentials["uri"]).To(o.HavePrefix("mysql://")) } unbind := func() { diff --git a/test/extended/templates/templateservicebroker_security.go b/test/extended/templates/templateservicebroker_security.go index 2675bae5fdf6..0fbc1b0a7a37 100644 --- a/test/extended/templates/templateservicebroker_security.go +++ b/test/extended/templates/templateservicebroker_security.go @@ -53,7 +53,7 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker security test brokercli, portForwardCmdClose = EnsureTSB(tsbOC) - template, err = cli.TemplateClient().Template().Templates("openshift").Get("cakephp-mysql-example", metav1.GetOptions{}) + template, err = cli.TemplateClient().Template().Templates("openshift").Get("mysql-ephemeral", metav1.GetOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) clusterrolebinding, err = cli.AdminAuthorizationClient().Authorization().ClusterRoleBindings().Create(&authorizationapi.ClusterRoleBinding{ @@ -122,11 +122,11 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker security test if err != nil { templateInstance, err := cli.TemplateClient().Template().TemplateInstances(cli.Namespace()).Get(instanceID, metav1.GetOptions{}) if err != nil { - fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v", err) + fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v\n", err) } else { err := dumpObjectReadiness(cli, templateInstance) if err != nil { - fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v", err) + fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v\n", err) } } } diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 5a8a87bf622f..54b502831e56 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -18398,7 +18398,8 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -18447,10 +18448,7 @@ var _examplesQuickstartsCakephpMysqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -19003,7 +19001,8 @@ var _examplesQuickstartsCakephpMysqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -19052,10 +19051,7 @@ var _examplesQuickstartsCakephpMysqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -19582,7 +19578,8 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Dancer based application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/dancer-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -19629,10 +19626,7 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -20131,7 +20125,8 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Dancer based application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/dancer-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -20178,10 +20173,7 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -20654,7 +20646,8 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Django based application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/django-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -20701,10 +20694,7 @@ var _examplesQuickstartsDjangoPostgresqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -21213,7 +21203,8 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Django based application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/django-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -21260,10 +21251,7 @@ var _examplesQuickstartsDjangoPostgresqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -21746,7 +21734,8 @@ var _examplesQuickstartsHttpdJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a static application served by Apache HTTP Server (httpd), including a build configuration and application deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/httpd-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -21780,10 +21769,7 @@ var _examplesQuickstartsHttpdJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -22039,7 +22025,8 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -22086,10 +22073,7 @@ var _examplesQuickstartsNodejsMongodbPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -22607,7 +22591,8 @@ var _examplesQuickstartsNodejsMongodbJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a NodeJS application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/nodejs-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -22654,10 +22639,7 @@ var _examplesQuickstartsNodejsMongodbJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -23151,7 +23133,8 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/rails-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -23163,11 +23146,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-username": "{.data['application-user']}", - "template.openshift.io/expose-password": "{.data['application-password']}" - } + "name": "${NAME}" }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -23204,10 +23183,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -23780,7 +23756,8 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a Rails application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/rails-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -23792,11 +23769,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ "kind": "Secret", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-username": "{.data['application-user']}", - "template.openshift.io/expose-password": "{.data['application-password']}" - } + "name": "${NAME}" }, "stringData" : { "database-user" : "${DATABASE_USER}", @@ -23833,10 +23806,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}", @@ -27467,7 +27437,8 @@ var _examplesQuickstartsCakephpMysqlJsonCakephpMysqlJson = []byte(`{ "openshift.io/long-description": "This template defines resources needed to develop a CakePHP application, including a build configuration, application deployment configuration, and database deployment configuration. The database is stored in non-persistent storage, so this configuration should be used for experimental purposes only.", "openshift.io/provider-display-name": "Red Hat, Inc.", "openshift.io/documentation-url": "https://github.com/openshift/cakephp-ex", - "openshift.io/support-url": "https://access.redhat.com" + "openshift.io/support-url": "https://access.redhat.com", + "template.openshift.io/bindable": "false" } }, "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.", @@ -27516,10 +27487,7 @@ var _examplesQuickstartsCakephpMysqlJsonCakephpMysqlJson = []byte(`{ "kind": "Route", "apiVersion": "v1", "metadata": { - "name": "${NAME}", - "annotations": { - "template.openshift.io/expose-uri": "http://{.spec.host}{.spec.path}" - } + "name": "${NAME}" }, "spec": { "host": "${APPLICATION_DOMAIN}",