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

…er-genesis-kit

kit.yml

@@ -1,5 +1,5 @@
 name:    cf-app-autoscaler
-version: 4.0.0
+version: 4.0.1
 author:  Dennis Bell <[email protected]>
          Ioannis Tsouvalas <[email protected]>
 docs:    https://github.com/cloudfoundry/app-autoscaler-release

overlay/releases.yml

@@ -0,0 +1,6 @@
+---
+releases:
+- name:    "app-autoscaler"
+  version: "5.1.0"
+  url:     "https://bosh.io/d/github.com/cloudfoundry-incubator/app-autoscaler-release?v=5.1.0"
+  sha1:    "8459cd3109d02bce617ad763255b4fb98383a54e"

overlay/upstream_version.yml

@@ -1,3 +1,3 @@
 exodus:
-  app-autoscaler-release-version: 4.0.0
-  app-autoscaler-release-date:    2022-Jan-11 09:55:37 UTC
+  app-autoscaler-release-version: 5.1.0
+  app-autoscaler-release-date:    2022-Apr-10 09:04:18 UTC

spec/results/base.yml

@@ -87,8 +87,8 @@ addons:
     release: bpm
   name: bpm
 exodus:
-  app-autoscaler-release-date: 2022-Jan-11 09:55:37 UTC
-  app-autoscaler-release-version: 4.0.0
+  app-autoscaler-release-date: 2022-Apr-10 09:04:18 UTC
+  app-autoscaler-release-version: 5.1.0
   autoscaler_api_domain: autoscaler.sys.test.cf.domain
   autoscaler_metrics_domain: autoscalermetrics.sys.test.cf.domain
   bosh: base

spec/results/cf-v1-support.yml

@@ -87,8 +87,8 @@ addons:
     release: bpm
   name: bpm
 exodus:
-  app-autoscaler-release-date: 2022-Jan-11 09:55:37 UTC
-  app-autoscaler-release-version: 4.0.0
+  app-autoscaler-release-date: 2022-Apr-10 09:04:18 UTC
+  app-autoscaler-release-version: 5.1.0
   autoscaler_api_domain: autoscaler.sys.test.cf.domain
   autoscaler_metrics_domain: autoscalermetrics.sys.test.cf.domain
   bosh: cf-v1-support

spec/results/external-db.yml

@@ -87,8 +87,8 @@ addons:
     release: bpm
   name: bpm
 exodus:
-  app-autoscaler-release-date: 2022-Jan-11 09:55:37 UTC
-  app-autoscaler-release-version: 4.0.0
+  app-autoscaler-release-date: 2022-Apr-10 09:04:18 UTC
+  app-autoscaler-release-version: 5.1.0
   autoscaler_api_domain: autoscaler.sys.test.cf.domain
   autoscaler_metrics_domain: autoscalermetrics.sys.test.cf.domain
   bosh: external-db

spec/results/mysql.yml

@@ -94,8 +94,8 @@ addons:
     release: bpm
   name: bpm
 exodus:
-  app-autoscaler-release-date: 2022-Jan-11 09:55:37 UTC
-  app-autoscaler-release-version: 4.0.0
+  app-autoscaler-release-date: 2022-Apr-10 09:04:18 UTC
+  app-autoscaler-release-version: 5.1.0
   autoscaler_api_domain: autoscaler.sys.test.cf.domain
   autoscaler_metrics_domain: autoscalermetrics.sys.test.cf.domain
   bosh: mysql

spec/results/params.yml

@@ -87,8 +87,8 @@ addons:
     release: bpm
   name: bpm
 exodus:
-  app-autoscaler-release-date: 2022-Jan-11 09:55:37 UTC
-  app-autoscaler-release-version: 4.0.0
+  app-autoscaler-release-date: 2022-Apr-10 09:04:18 UTC
+  app-autoscaler-release-version: 5.1.0
   autoscaler_api_domain: autoscaler.cf-v1.lab.example.com
   autoscaler_metrics_domain: autoscalermetrics.cf-v1.lab.example.com
   bosh: params

upstream/operations/add-extra-plan.yml

@@ -0,0 +1,12 @@
+---
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=golangapiserver/properties/autoscaler/apiserver/broker/server/catalog/services/0/plans/-
+  value:
+    id: acceptance-standard
+    name: acceptance-standard
+    plan_updateable: false
+    description: This is the standard service plan for the Auto-Scaling service.
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=golangapiserver/properties/autoscaler/apiserver/broker/server/catalog/services/0/plans/0/plan_updateable?
+  value: true

upstream/operations/alternative-vm-type.yml

@@ -0,0 +1,20 @@
+
+- type: replace
+  path: /instance_groups/name=asactors/vm_type
+  value: ((alternative_vm_type))
+
+- type: replace
+  path: /instance_groups/name=asmetrics/vm_type
+  value: ((alternative_vm_type))
+
+- type: replace
+  path: /instance_groups/name=asnozzle/vm_type
+  value: ((alternative_vm_type))
+
+- type: replace
+  path: /instance_groups/name=asapi/vm_type
+  value: ((alternative_vm_type))
+
+- type: replace
+  path: /instance_groups/name=postgres_autoscaler/vm_type
+  value: ((alternative_vm_type))

upstream/operations/disable-basicauth-on-health-endpoints.yml

@@ -0,0 +1,84 @@
+---
+- type: remove 
+  path: /variables/name=autoscaler_scheduler_health_password
+
+- type: remove
+  path: /variables/name=autoscaler_eventgenerator_health_password
+
+- type: remove
+  path: /variables/name=autoscaler_metricsforwarder_health_password
+
+- type: remove
+  path: /variables/name=autoscaler_metricsgateway_health_password
+
+- type: remove
+  path: /variables/name=autoscaler_metricsserver_health_password
+
+- type: remove
+  path: /variables/name=autoscaler_operator_health_password
+
+- type: remove
+  path: /variables/name=autoscaler_scalingengine_health_password
+
+# asactors
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=scalingengine/properties/autoscaler/scalingengine/health/username
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=scalingengine/properties/autoscaler/scalingengine/health/password
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=scheduler/properties/autoscaler/scheduler/health/basicAuthEnabled
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=scheduler/properties/autoscaler/scheduler/health/username
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=scheduler/properties/autoscaler/scheduler/health/password
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=operator/properties/autoscaler/operator/health/username
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=operator/properties/autoscaler/operator/health/password
+
+#asmetrics
+- type: remove
+  path: /instance_groups/name=asmetrics/jobs/name=metricsserver/properties/autoscaler/metricsserver/health/username
+
+- type: remove
+  path: /instance_groups/name=asmetrics/jobs/name=metricsserver/properties/autoscaler/metricsserver/health/password
+
+- type: remove
+  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/health/username
+
+- type: remove
+  path: /instance_groups/name=asmetrics/jobs/name=eventgenerator/properties/autoscaler/eventgenerator/health/password
+
+# asnozzle
+- type: remove
+  path: /instance_groups/name=asnozzle/jobs/name=metricsgateway/properties/autoscaler/metricsgateway/health/username
+
+- type: remove
+  path: /instance_groups/name=asnozzle/jobs/name=metricsgateway/properties/autoscaler/metricsgateway/health/password
+
+# asapi
+- type: remove
+  path: /instance_groups/name=asapi/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/health/username
+
+- type: remove
+  path: /instance_groups/name=asapi/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/health/password
+
+# route_registrars
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=route_registrar
+
+- type: remove
+  path: /instance_groups/name=asmetrics/jobs/name=route_registrar
+
+- type: remove
+  path: /instance_groups/name=asnozzle/jobs/name=route_registrar
+
+- type: remove
+  path: /instance_groups/name=asapi/jobs/name=route_registrar/properties/route_registrar/routes/name=autoscaler_metricsforwarder_health

upstream/operations/enable-nats-tls.yml

@@ -0,0 +1,69 @@
+---
+# routing api from certs
+- type: replace
+  path: /instance_groups/name=asactors/jobs/name=route_registrar/properties/nats?
+  value:
+    tls:
+      enabled: true
+      client_cert: ((/bosh-autoscaler/cf/nats_client_cert.certificate))
+      client_key: ((/bosh-autoscaler/cf/nats_client_cert.private_key))
+
+- type: remove
+  path: /instance_groups/name=asactors/jobs/name=route_registrar/consumes/nats
+
+- type: replace
+  path: /instance_groups/name=asactors/jobs/name=route_registrar/consumes/nats-tls?
+  value:
+    from: nats-tls
+    deployment: cf
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=route_registrar/properties/nats?
+  value:
+    tls:
+      enabled: true
+      client_cert: ((/bosh-autoscaler/cf/nats_client_cert.certificate))
+      client_key: ((/bosh-autoscaler/cf/nats_client_cert.private_key))
+
+- type: remove
+  path: /instance_groups/name=asapi/jobs/name=route_registrar/consumes/nats
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=route_registrar/consumes/nats-tls?
+  value:
+    from: nats-tls
+    deployment: cf
+
+- type: replace
+  path: /instance_groups/name=asnozzle/jobs/name=route_registrar/properties/nats?
+  value:
+    tls:
+      enabled: true
+      client_cert: ((/bosh-autoscaler/cf/nats_client_cert.certificate))
+      client_key: ((/bosh-autoscaler/cf/nats_client_cert.private_key))
+
+- type: remove
+  path: /instance_groups/name=asnozzle/jobs/name=route_registrar/consumes/nats
+
+- type: replace
+  path: /instance_groups/name=asnozzle/jobs/name=route_registrar/consumes/nats-tls?
+  value:
+    from: nats-tls
+    deployment: cf
+
+- type: replace
+  path: /instance_groups/name=asmetrics/jobs/name=route_registrar/properties/nats?
+  value:
+    tls:
+      enabled: true
+      client_cert: ((/bosh-autoscaler/cf/nats_client_cert.certificate))
+      client_key: ((/bosh-autoscaler/cf/nats_client_cert.private_key))
+
+- type: remove
+  path: /instance_groups/name=asmetrics/jobs/name=route_registrar/consumes/nats
+
+- type: replace
+  path: /instance_groups/name=asmetrics/jobs/name=route_registrar/consumes/nats-tls?
+  value:
+    from: nats-tls
+    deployment: cf

upstream/operations/instance-identity-cert-from-cf.yml

@@ -0,0 +1,21 @@
+---
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/metricshandler?
+  value:
+    tls:
+      ca_cert: ((/bosh-autoscaler/cf/diego_instance_identity_ca.certificate))
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=golangapiserver/properties/autoscaler/apiserver/metrics_forwarder/mtls_host?
+  value: autoscaler-metricsforwarder-mtls.((system_domain))
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=route_registrar/properties/route_registrar/routes/-
+  value:
+    name: autoscaler_metrics_forwarder_mtls
+    registration_interval: 20s
+    port: 6201
+    tags:
+      component: autoscaler_metrics_forwarder_mtls
+    uris:
+    - autoscaler-metricsforwarder-mtls.((system_domain))

upstream/operations/loggregator-certs-from-cf.yml

@@ -0,0 +1,22 @@
+---
+- type: replace
+  path: /instance_groups/name=asnozzle/jobs/name=metricsgateway/properties/autoscaler/metricsgateway/nozzle/loggregator_rlp_tls
+  value:
+    cert: ((/bosh-autoscaler/cf/loggregator_tls_rlp.certificate))
+    key: ((/bosh-autoscaler/cf/loggregator_tls_rlp.private_key))
+    ca_cert: ((/bosh-autoscaler/cf/loggregator_ca.certificate))
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/loggregator/tls
+  value:
+    ca_cert: ((/bosh-autoscaler/cf/loggregator_tls_agent.ca))
+    cert: ((/bosh-autoscaler/cf/loggregator_tls_agent.certificate))
+    key: ((/bosh-autoscaler/cf/loggregator_tls_agent.private_key))
+
+- type: replace
+  path: /instance_groups/name=asapi/jobs/name=loggregator_agent/properties/loggregator/tls
+  value:
+    ca_cert: ((/bosh-autoscaler/cf/loggregator_ca.certificate))
+    agent:  
+      cert: ((/bosh-autoscaler/cf/loggregator_tls_agent.certificate))
+      key: ((/bosh-autoscaler/cf/loggregator_tls_agent.private_key))

upstream/operations/postgres-persistent-disk.yml

@@ -0,0 +1,4 @@
+---
+- type: replace
+  path: /instance_groups/name=postgres_autoscaler/persistent_disk_type?
+  value: 10GB  

upstream/templates/app-autoscaler-deployment.yml

@@ -254,17 +254,17 @@ instance_groups:
             port: *scalingEnginePort
             ca_cert: ((scalingengine_ca.ca))
             client_cert: ((scalingengine_client.certificate))
-            client_key: ((scalingengine_client.private_key))
+            client_key: ((scalingengine_client.private_key))                
           scheduler:
             port: *schedulerPort
             ca_cert: ((scheduler_ca.ca))
             client_cert: ((scheduler_client.certificate))
-            client_key: ((scheduler_client.private_key))
-          db_lock:
+            client_key: ((scheduler_client.private_key))        
+          db_lock: 
             ttl: 15s
             retry_interval: 5s
           logging:
-            level: info
+            level: info 
           http_client_timeout: 60s
           health:
             port: &operatorHealthPort 6208
@@ -424,7 +424,7 @@ instance_groups:
   vm_type: small
   update:
     max_in_flight: 1
-    serial: true
+    serial: true  
   jobs:
   - name: metricsgateway
     release: app-autoscaler
@@ -498,8 +498,7 @@ instance_groups:
           broker:
             server:
               port: &brokerServerPort 6102
-
-              catalog:
+              catalog: 
                 services:
                 - id: autoscaler-guid
                   name: autoscaler
@@ -533,9 +532,9 @@ instance_groups:
           event_generator:
             ca_cert: ((eventgenerator_ca.ca))
             client_cert: ((eventgenerator_client.certificate))
-            client_key: ((eventgenerator_client.private_key))
-          metrics_forwarder:
-            host: autoscalermetrics.((system_domain))
+            client_key: ((eventgenerator_client.private_key)) 
+          metrics_forwarder: 
+            host: autoscalermetrics.((system_domain))              
         policy_db: *database
         policy_db_connection_config: *databaseConnectionConfig
         binding_db: *database
@@ -675,7 +674,7 @@ variables:
     ca: eventgenerator_ca
     common_name: eventgenerator client
     extended_key_usage:
-    - client_auth
+    - client_auth      
 - name: apiserver_ca
   type: certificate
   options:
@@ -724,7 +723,7 @@ variables:
     ca: servicebroker_ca
     common_name: servicebroker.service.cf.internal
     alternative_names:
-    - servicebroker.service.cf.internal
+    - servicebroker.service.cf.internal  
     extended_key_usage:
     - client_auth
     - server_auth