From 460e7621b5503bea3dcea1c8ca004f0a18240f10 Mon Sep 17 00:00:00 2001
From: geigerj0 <112163019+geigerj0@users.noreply.github.com>
Date: Wed, 19 Jun 2024 14:55:22 +0200
Subject: [PATCH] remove instancemetrics_db leftovers which refer to the
 appinstancemetrics table that got deleted

---
 jobs/operator/spec                            | 32 -------------------
 operations/connect_to_postgres_with_certs.yml |  6 ----
 operations/disable-postgres-tls-config.yml    |  4 ---
 templates/app-autoscaler.yml                  |  1 -
 4 files changed, 43 deletions(-)

diff --git a/jobs/operator/spec b/jobs/operator/spec
index ba529df29d..26c101cfd6 100644
--- a/jobs/operator/spec
+++ b/jobs/operator/spec
@@ -90,32 +90,6 @@ properties:
     default: disable
     description: "sslmode to connect to postgres server"
 
-
-  autoscaler.instancemetrics_db.address:
-    description: "IP address on which the instancemetricsdb server will listen"
-    default: "autoscalerpostgres.service.cf.internal"
-  autoscaler.instancemetrics_db.databases:
-    description: "The list of databases used in instancemetricsdb database including name"
-  autoscaler.instancemetrics_db.db_scheme:
-    description: "Database scheme to be used to access instancemetricsdb"
-    default: postgres
-  autoscaler.instancemetrics_db.port:
-    description: "Port on which the instancemetricsdb server will listen"
-  autoscaler.instancemetrics_db.roles:
-    description: "The list of database roles used in instancemetricsdb database including name/password"
-  autoscaler.instancemetrics_db.tls.ca:
-    default: ''
-    description: 'PEM-encoded ca certificate for TLS database server'
-  autoscaler.instancemetrics_db.tls.certificate:
-    default: ''
-    description: 'PEM-encoded certificate for TLS database client'
-  autoscaler.instancemetrics_db.tls.private_key:
-    default: ''
-    description: 'PEM-encoded key for tls database client'
-  autoscaler.instancemetrics_db.sslmode:
-    default: disable
-    description: "sslmode to connect to postgres server"
-
   autoscaler.appmetrics_db.address:
     description: "IP address on which the appmetricsdb server will listen"
     default: "autoscalerpostgres.service.cf.internal"
@@ -181,12 +155,6 @@ properties:
   autoscaler.appmetrics_db_connection_config.connection_max_lifetime:
     default: 60s
 
-  autoscaler.instancemetrics_db_connection_config.max_open_connections:
-    default: 10
-  autoscaler.instancemetrics_db_connection_config.max_idle_connections:
-    default: 1
-  autoscaler.instancemetrics_db_connection_config.connection_max_lifetime:
-    default: 60s
 
   autoscaler.scalingengine_db_connection_config.max_open_connections:
     default: 10
diff --git a/operations/connect_to_postgres_with_certs.yml b/operations/connect_to_postgres_with_certs.yml
index 23fd439797..65770615f4 100644
--- a/operations/connect_to_postgres_with_certs.yml
+++ b/operations/connect_to_postgres_with_certs.yml
@@ -43,12 +43,6 @@
   path: /instance_groups/name=scheduler/jobs/name=scheduler/properties/autoscaler/policy_db/tls/private_key
   value: ((postgres_client.private_key))
 
-- type: replace
-  path: /instance_groups/name=operator/jobs/name=operator/properties/autoscaler/instancemetrics_db/tls/certificate
-  value: ((postgres_client.certificate))
-- type: replace
-  path: /instance_groups/name=operator/jobs/name=operator/properties/autoscaler/instancemetrics_db/tls/private_key
-  value: ((postgres_client.private_key))
 - type: replace
   path: /instance_groups/name=operator/jobs/name=operator/properties/autoscaler/appmetrics_db/tls/certificate
   value: ((postgres_client.certificate))
diff --git a/operations/disable-postgres-tls-config.yml b/operations/disable-postgres-tls-config.yml
index 56a402ae71..2544303d58 100644
--- a/operations/disable-postgres-tls-config.yml
+++ b/operations/disable-postgres-tls-config.yml
@@ -45,10 +45,6 @@
   path: /instance_groups/name=operator/jobs/name=operator/properties/autoscaler/appmetrics_db/sslmode
   value: disable
 
-- type: replace
-  path: /instance_groups/name=operator/jobs/name=operator/properties/autoscaler/instancemetrics_db/sslmode
-  value: disable
-
 - type: replace
   path: /instance_groups/name=operator/jobs/name=operator/properties/autoscaler/lock_db/sslmode
   value: disable
diff --git a/templates/app-autoscaler.yml b/templates/app-autoscaler.yml
index a1a0e3aeb3..64bd2a35de 100644
--- a/templates/app-autoscaler.yml
+++ b/templates/app-autoscaler.yml
@@ -366,7 +366,6 @@ instance_groups:
     release: app-autoscaler
     properties:
       autoscaler:
-        instancemetrics_db: *database
         appmetrics_db: *database
         appmetrics_db_connection_config: *databaseConnectionConfig
         scalingengine_db: *database