Merge branch 'master' of github.com:genesis-community/cf-app-autoscal…

…er-genesis-kit
genesis-community · Aug 17, 2022 · c7e1a1b · c7e1a1b
2 parents df1e1a6 + c4102cf
commit c7e1a1b
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 47 deletions.
diff --git a/MANUAL.md b/MANUAL.md
@@ -92,6 +92,24 @@ It requires the following credhub values:
 * `autoscaler_database_password` (password)
 * `autoscaler_database_tls_ca` (certificate)
 
+### `subdomain_prefix`
+
+By default the subdomain prefix is `autoscaler`, and therefore we would have these urls:
+* `autoscaler.${system_domain}`
+* `autoscalermetrics.${system_domain}`
+* `autoscalerservicebroker.${system_domain}`
+
+This can be overridden in the environment file as follows, let's say you wanted it
+to be `aas` short for "app auto scaler":
+```yaml
+params:
+  subdomain_prefix: "aas"
+```
+This would result in the following urls:
+* `aas.${system_domain}`
+* `aasmetrics.${system_domain}`
+* `aasservicebroker.${system_domain}`
+
 ### `postgres`
 
 This is the default database type, but can be explicitly stated.

diff --git a/hooks/blueprint b/hooks/blueprint
@@ -19,7 +19,7 @@ manifests=( \
   "overlay/releases/app-autoscaler.yml" \
 )
 
-if (genesis -C "$GENESIS_ROOT" lookup --defined "$GENESIS_ENVIRONMENT" "bosh-variables.subdomain_root" 2>/dev/null); then
+if (genesis -C "$GENESIS_ROOT" lookup --defined "$GENESIS_ENVIRONMENT" "params.subdomain_prefix" 2>/dev/null); then
   manifests+=( "overlay/change_subdomain.yml" )
 fi
 

diff --git a/overlay/base.yml b/overlay/base.yml
@@ -12,7 +12,6 @@ params:
   cf_system_domain:   (( vault meta.cf.exodus ":system_domain" ))
 
 bosh-variables:
-  system_domain:    (( grab params.cf_system_domain ))
   cf_client_id:     (( vault meta.cf.exodus ":app_autoscaler_client" ))
   cf_client_secret: (( vault meta.cf.exodus ":app_autoscaler_secret" ))
   loggregator_ca:

diff --git a/overlay/change_subdomain.yml b/overlay/change_subdomain.yml
@@ -7,33 +7,33 @@ instance_groups:
       autoscaler:
         apiserver:
           metrics_forwarder:
-            host: ((subdomain_root))metrics.((system_domain))
+            host: (( concat params.subdomain_prefix "metrics." params.cf_system_domain ))
   - name: route_registrar
     properties:
       route_registrar:
         routes:
         - name: api_server
           uris:
             - (( replace ))
-            - ((subdomain_root)).((system_domain))
+            - (( concat params.subdomain_prefix "." params.cf_system_domain ))
         - name: autoscaler_service_broker
           uris:
             - (( replace ))
-            - ((subdomain_root))servicebroker.((system_domain))
+            - (( concat params.subdomain_prefix "servicebroker." params.cf_system_domain))
         - name: autoscaler_metrics_forwarder
           uris:
             - (( replace ))
-            - ((subdomain_root))metrics.((system_domain))
+            - (( concat params.subdomain_prefix "metrics." params.cf_system_domain ))
 variables:
 - name: apiserver_public_server
   options:
-    common_name: ((subdomain_root)).((system_domain))
+    common_name: (( concat params.subdomain_prefix "." params.cf_system_domain ))
 - name: servicebroker_public_server
   options:
-    common_name: ((subdomain_root))servicebroker.((system_domain))
+    common_name: (( concat params.subdomain_prefix "servicebroker." params.cf_system_domain ))
 
 exodus:
-  autoscaler_api_domain:     (( concat bosh-variables.subdomain_root "." params.cf_system_domain ))
-  autoscaler_metrics_domain: (( concat bosh-variables.subdomain_root "metrics." params.cf_system_domain ))
-  service_broker_domain:     (( concat bosh-variables.subdomain_root "servicebroker." params.cf_system_domain ))
+  autoscaler_api_domain:     (( concat params.subdomain_prefix "." params.cf_system_domain ))
+  autoscaler_metrics_domain: (( concat params.subdomain_prefix "metrics." params.cf_system_domain ))
+  service_broker_domain:     (( concat params.subdomain_prefix "servicebroker." params.cf_system_domain ))
 
diff --git a/overlay/releases/app-autoscaler.yml b/overlay/releases/app-autoscaler.yml
@@ -2,6 +2,6 @@
   path: /releases?/name=app-autoscaler?
   value:
     name: app-autoscaler
-    version: 5.4.0
-    url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.4.0
-    sha1: 1e78968a12c576f0fc780f1c9b5571ba26ecfc48
+    version: 6.1.0
+    url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=6.1.0
+    sha1: c7917237f3dcbc3df709c8a2efbf2a590066499e
diff --git a/spec/results/base.yml b/spec/results/base.yml
@@ -977,9 +977,9 @@ instance_groups:
 name: base-cf-app-autoscaler
 releases:
 - name: app-autoscaler
-  sha1: 1e78968a12c576f0fc780f1c9b5571ba26ecfc48
-  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.4.0
-  version: 5.4.0
+  sha1: c7917237f3dcbc3df709c8a2efbf2a590066499e
+  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=6.1.0
+  version: 6.1.0
 - name: postgres
   sha1: 24d2e2887a45258b71bc40577c0f406180e47701
   url: https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=29

diff --git a/spec/results/cf-v1-support.yml b/spec/results/cf-v1-support.yml
@@ -977,9 +977,9 @@ instance_groups:
 name: cf-v1-support-cf-app-autoscaler
 releases:
 - name: app-autoscaler
-  sha1: 1e78968a12c576f0fc780f1c9b5571ba26ecfc48
-  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.4.0
-  version: 5.4.0
+  sha1: c7917237f3dcbc3df709c8a2efbf2a590066499e
+  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=6.1.0
+  version: 6.1.0
 - name: postgres
   sha1: 24d2e2887a45258b71bc40577c0f406180e47701
   url: https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=29

diff --git a/spec/results/external-db.yml b/spec/results/external-db.yml
@@ -853,9 +853,9 @@ instance_groups:
 name: external-db-cf-app-autoscaler
 releases:
 - name: app-autoscaler
-  sha1: 1e78968a12c576f0fc780f1c9b5571ba26ecfc48
-  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.4.0
-  version: 5.4.0
+  sha1: c7917237f3dcbc3df709c8a2efbf2a590066499e
+  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=6.1.0
+  version: 6.1.0
 - name: postgres
   sha1: 24d2e2887a45258b71bc40577c0f406180e47701
   url: https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=29

diff --git a/spec/results/mysql.yml b/spec/results/mysql.yml
@@ -860,9 +860,9 @@ instance_groups:
 name: mysql-cf-app-autoscaler
 releases:
 - name: app-autoscaler
-  sha1: 1e78968a12c576f0fc780f1c9b5571ba26ecfc48
-  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.4.0
-  version: 5.4.0
+  sha1: c7917237f3dcbc3df709c8a2efbf2a590066499e
+  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=6.1.0
+  version: 6.1.0
 - name: postgres
   sha1: 24d2e2887a45258b71bc40577c0f406180e47701
   url: https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=29

diff --git a/spec/results/params.yml b/spec/results/params.yml
@@ -853,9 +853,9 @@ instance_groups:
 name: params-cf-app-autoscaler
 releases:
 - name: app-autoscaler
-  sha1: 1e78968a12c576f0fc780f1c9b5571ba26ecfc48
-  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.4.0
-  version: 5.4.0
+  sha1: c7917237f3dcbc3df709c8a2efbf2a590066499e
+  url: https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=6.1.0
+  version: 6.1.0
 - name: postgres
   sha1: 24d2e2887a45258b71bc40577c0f406180e47701
   url: https://bosh.io/d/github.com/cloudfoundry/postgres-release?v=29

diff --git a/upstream/operations/instance-identity-cert-from-cf.yml b/upstream/operations/instance-identity-cert-from-cf.yml
@@ -7,7 +7,7 @@
 
 - type: replace
   path: /instance_groups/name=asapi/jobs/name=golangapiserver/properties/autoscaler/apiserver/metrics_forwarder/mtls_host?
-  value: autoscaler-metricsforwarder-mtls.((system_domain))
+  value: (( concat "autoscaler-metricsforwarder-mtls." params.cf_system_domain ))
 
 - type: replace
   path: /instance_groups/name=asapi/jobs/name=route_registrar/properties/route_registrar/routes/-
@@ -18,4 +18,4 @@
     tags:
       component: autoscaler_metrics_forwarder_mtls
     uris:
-    - autoscaler-metricsforwarder-mtls.((system_domain))
+    - (( concat "autoscaler-metricsforwarder-mtls." params.cf_system_domain ))
diff --git a/upstream/templates/app-autoscaler-deployment.yml b/upstream/templates/app-autoscaler-deployment.yml
@@ -189,7 +189,7 @@ instance_groups:
         scheduler_db_connection_config: *databaseConnectionConfig
         policy_db_connection_config: *databaseConnectionConfig
         cf: &cf_credentials
-          api: "https://api.((system_domain))"
+          api: (( concat "https://api." params.cf_system_domain ))
           grant_type: client_credentials
           client_id: "((cf_client_id))"
           secret: "((cf_client_secret))"
@@ -283,21 +283,21 @@ instance_groups:
             tags:
               component: autoscaler_scalingengine_health
             uris:
-              - autoscaler-scalingengine.((system_domain))
+              - (( concat "autoscaler-scalingengine." params.cf_system_domain ))
           - name: autoscaler_operator_health
             registration_interval: 20s
             port: *operatorHealthPort
             tags:
               component: autoscaler_operator_health
             uris:
-              - autoscaler-operator.((system_domain))
+              - (( concat "autoscaler-operator." params.cf_system_domain ))
           - name: autoscaler_scheduler_health
             registration_interval: 20s
             port: *schedulerHealthPort
             tags:
               component: autoscaler_scheduler_health
             uris:
-              - autoscaler-scheduler.((system_domain))
+              - (( concat "autoscaler-scheduler." params.cf_system_domain ))
 # asmetrics Instance Group: metricsserver&eventgenerator
 - name: asmetrics
   azs:
@@ -406,14 +406,14 @@ instance_groups:
             tags:
               component: autoscaler_eventgenerator_health
             uris:
-              - autoscaler-eventgenerator.((system_domain))
+              - (( concat "autoscaler-eventgenerator." params.cf_system_domain ))
           - name: autoscaler_metricsserver_health
             registration_interval: 20s
             port: *metricsserverHealthPort
             tags:
               component: autoscaler_metricsserver_health
             uris:
-              - autoscaler-metricsserver.((system_domain))
+              - (( concat "autoscaler-metricsserver." params.cf_system_domain ))
 - name: asnozzle
   azs:
   - z1
@@ -474,7 +474,7 @@ instance_groups:
             tags:
               component: autoscaler_metricsgateway_health
             uris:
-              - autoscaler-metricsgateway.((system_domain))
+              - (( concat "autoscaler-metricsgateway." params.cf_system_domain ))
 # asapi Instance Group : apiserver&servicebroker
 - name: asapi
   azs:
@@ -534,7 +534,7 @@ instance_groups:
             client_cert: ((eventgenerator_client.certificate))
             client_key: ((eventgenerator_client.private_key)) 
           metrics_forwarder: 
-            host: autoscalermetrics.((system_domain))              
+            host: (( concat "autoscalermetrics." params.cf_system_domain ))
         policy_db: *database
         policy_db_connection_config: *databaseConnectionConfig
         binding_db: *database
@@ -578,28 +578,28 @@ instance_groups:
           tags:
             component: api_server
           uris:
-            - autoscaler.((system_domain))
+            - (( concat "autoscaler." params.cf_system_domain ))
         - name: autoscaler_service_broker
           registration_interval: 20s
           port: *brokerServerPort
           tags:
             component: autoscaler_service_broker
           uris:
-            - autoscalerservicebroker.((system_domain))
+            - (( concat "autoscalerservicebroker." params.cf_system_domain ))
         - name: autoscaler_metrics_forwarder
           registration_interval: 20s
           port: *metricsforwarderServerPort
           tags:
             component: autoscaler_metrics_forwarder
           uris:
-            - autoscalermetrics.((system_domain))
+            - (( concat "autoscalermetrics." params.cf_system_domain ))
         - name: autoscaler_metricsforwarder_health
           registration_interval: 20s
           port: *metricsforwarderHealthPort
           tags:
             component: autoscaler_metricsforwarder_health
           uris:
-            - autoscaler-metricsforwarder.((system_domain))
+            - (( concat "autoscaler-metricsforwarder." params.cf_system_domain ))
   - name: loggregator_agent
     release: loggregator-agent
     consumes:
@@ -699,9 +699,9 @@ variables:
   type: certificate
   options:
     ca: apiserver_public_ca
-    common_name: autoscaler.((system_domain))
+    common_name: (( concat "autoscaler." params.cf_system_domain ))
     alternative_names:
-    - autoscaler.((system_domain))
+    - (( concat "autoscaler." params.cf_system_domain ))
     extended_key_usage:
     - client_auth
     - server_auth
@@ -743,9 +743,9 @@ variables:
   type: certificate
   options:
     ca: servicebroker_public_ca
-    common_name: autoscalerservicebroker.((system_domain))
+    common_name: (( concat "autoscalerservicebroker." params.cf_system_domain ))
     alternative_names:
-    - autoscalerservicebroker.((system_domain))
+    - (( concat "autoscalerservicebroker." params.cf_system_domain ))
     extended_key_usage:
     - client_auth
     - server_auth