Register servicebroker to gorouter (cloudfoundry#82)

* Register servicebroker to gorouter [#151509412] 1 disable tls of servicebroker 2 register servicebroker to gorouter by nets * system domain and port
cshunger · Oct 5, 2017 · b85d574 · b85d574
1 parent 7d43e3c
commit b85d574
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 25 deletions.
diff --git a/jobs/servicebroker/templates/config.json.erb b/jobs/servicebroker/templates/config.json.erb
@@ -29,11 +29,11 @@
         },
     },
     'httpRequestTimeout' => p('service_broker.http_request_timeout'),
-    'tls' => {
-        'keyFile' => "/var/vcap/jobs/servicebroker/config/certs/servicebroker/server.key",
-        'certFile' => "/var/vcap/jobs/servicebroker/config/certs/servicebroker/server.crt",
-        'caCertFile' => "/var/vcap/jobs/servicebroker/config/certs/servicebroker/ca.crt",
-    },
+    # 'tls' => {
+    #     'keyFile' => "/var/vcap/jobs/servicebroker/config/certs/servicebroker/server.key",
+    #     'certFile' => "/var/vcap/jobs/servicebroker/config/certs/servicebroker/server.crt",
+    #     'caCertFile' => "/var/vcap/jobs/servicebroker/config/certs/servicebroker/ca.crt",
+    # },
     'serviceCatalogPath' => "/var/vcap/jobs/servicebroker/config/catalog.json",
     'dashboardRedirectUri' => p('service_broker.dashboard_redirect_uri')
   }

diff --git a/templates/app-autoscaler-deployment.yml b/templates/app-autoscaler-deployment.yml
@@ -94,21 +94,6 @@ instance_groups:
         agent:
           services:
             apiserver: {}
-  - name: route_registrar
-    release: routing
-    consumes:
-      nats: {from: nats, deployment: cf}
-    properties:
-      route_registrar:
-        routes:
-        - name: api_server_public_api
-          registration_interval: 20s
-          port: 6106
-          tags:
-            component: api_server
-          uris:
-            - autoscaler.bosh-lite.com
-
   - name: apiserver
     release: app-autoscaler
     properties:
@@ -118,7 +103,7 @@ instance_groups:
           max_connections: 10
           min_connections: 0
         port: 6100
-        publicPort: 6106
+        publicPort: &apiServerPublicPort 6106
         ca_cert: ((apiserver_ca.ca))
         server_cert: ((apiserver_server.certificate))
         server_key:  ((apiserver_server.private_key))
@@ -140,6 +125,20 @@ instance_groups:
       policy_db: *database
       cf:
         api: "https://api.((system_domain))"
+  - name: route_registrar
+    release: routing
+    consumes:
+      nats: {from: nats, deployment: cf}
+    properties:
+      route_registrar:
+        routes:
+        - name: api_server_public_api
+          registration_interval: 20s
+          port: *apiServerPublicPort
+          tags:
+            component: api_server
+          uris:
+            - autoscaler.((system_domain))
 
 # Scheduler Instance Group
 - name: scheduler
@@ -199,9 +198,9 @@ instance_groups:
   - name: servicebroker
     release: app-autoscaler
     properties:
-      service_broker:
+      service_broker: 
         db_config: *db_config
-        port : 6101
+        port : &servicebrokerPort 6101
         ca_cert: ((servicebroker_ca.ca))
         server_cert: ((servicebroker_server.certificate))
         server_key: ((servicebroker_server.private_key))
@@ -224,6 +223,20 @@ instance_groups:
           client_cert: ((apiserver_client.certificate))
           client_key: ((apiserver_client.private_key))
       binding_db: *database
+  - name: route_registrar
+    release: routing
+    consumes:
+      nats: {from: nats, deployment: cf}
+    properties:
+      route_registrar:
+        routes:
+        - name: autoscaler_service_broker
+          registration_interval: 20s
+          port: *servicebrokerPort
+          tags:
+            component: autoscaler_service_broker
+          uris:
+            - autoscalerservicebroker.((system_domain))
 
 # Pruner Instance Group
 - name: pruner

diff --git a/templates/bosh-lite-manifest-template-v1.yml b/templates/bosh-lite-manifest-template-v1.yml
@@ -111,7 +111,7 @@ jobs:
         routes:
         - name: api_server_public_api
           registration_interval: 20s
-          port: 6106
+          port: (( api_server_properties.publicPort ))
           tags:
             component: api_server
           uris:
@@ -149,6 +149,10 @@ jobs:
         consumes: {consul_client: nil, consul_server: nil, consul_common: nil}
       - name: servicebroker
         release: app-autoscaler
+      - name: route_registrar
+      release: routing
+      consumes:
+        nats: {from: nats, deployment: cf}
     properties:
       service_broker: (( service_broker_properties ))
       binding_db: (( bindingdb ))
@@ -157,6 +161,15 @@ jobs:
           mode: client
           services:
             servicebroker: {}
+      route_registrar:
+            routes:
+            - name: autoscaler_service_broker
+              registration_interval: 20s
+              port: (( service_broker_properties.port ))
+              tags:
+                component: autoscaler_service_broker
+              uris:
+                - autoscalerservicebroker.bosh-lite.com
 
 
   - name: pruner

diff --git a/templates/bosh-lite-manifest-template-v2.yml b/templates/bosh-lite-manifest-template-v2.yml
@@ -121,7 +121,7 @@ instance_groups:
             routes:
             - name: api_server_public_api
               registration_interval: 20s
-              port: 6106
+              port: ((api_server_properties.publicPort))
               tags:
                 component: api_server
               uris:
@@ -194,6 +194,20 @@ instance_groups:
           service_broker: (( service_broker_properties ))
           binding_db: (( bindingdb ))
         release: app-autoscaler
+      - name: route_registrar
+        release: routing
+        consumes:
+          nats: {from: nats, deployment: cf}
+        properties:
+          route_registrar:
+            routes:
+            - name: autoscaler_service_broker
+              registration_interval: 20s
+              port: (( service_broker_properties.port ))
+              tags:
+                component: autoscaler_service_broker
+              uris:
+                - autoscalerservicebroker.bosh-lite.com
 
 # Pruner Instance Group