From 665b9b8fc0594e21ad662c569813a5acc4beaa0a Mon Sep 17 00:00:00 2001
From: Alex Ramos <aramos@asserts.ai>
Date: Wed, 19 Oct 2022 09:50:29 -0700
Subject: [PATCH] scale map service to 0, remove postgres

---
 karte/helm/karte-umbrella/Chart.yaml          | 22 ++++++++--------
 .../helm/karte-umbrella/multi-env-values.yaml |  5 +++-
 karte/helm/karte-umbrella/values.yaml         | 25 -------------------
 karte/helm/karte/Chart.yaml                   |  2 +-
 .../karte/templates/additional-services.yaml  |  2 +-
 karte/helm/karte/values.yaml                  |  5 ++--
 6 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/karte/helm/karte-umbrella/Chart.yaml b/karte/helm/karte-umbrella/Chart.yaml
index fe2fcfb..0ef3f03 100644
--- a/karte/helm/karte-umbrella/Chart.yaml
+++ b/karte/helm/karte-umbrella/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: karte-umbrella
 description: A demo application for Asserts
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: latest
 
 dependencies:
@@ -10,24 +10,24 @@ dependencies:
     version: "17.1.0"
     repository: "https://prometheus-community.github.io/helm-charts"
     condition: kube-prometheus-stack.enabled
-  - name: fluent-bit
-    version: "0.12.3"
-    repository: "https://fluent.github.io/helm-charts"
-    condition: fluent-bit.enabled
-  - name: postgresql
-    version: "10.12.4"
-    repository: "https://charts.bitnami.com/bitnami"
+  #- name: fluent-bit
+  #  version: "0.12.3"
+  #  repository: "https://fluent.github.io/helm-charts"
+  #  condition: fluent-bit.enabled
+  #- name: postgresql
+  #  version: "10.12.4"
+  #  repository: "https://charts.bitnami.com/bitnami"
   - name: karte
-    version: "0.1.0"
+    version: "0.2.0"
     repository: "file://../karte"
     condition: karte.enabled
   - name: karte
-    version: "0.1.0"
+    version: "0.2.0"
     repository: "file://../karte"
     alias: karte-prod
     condition: karte-prod.multiEnv
   - name: karte
-    version: "0.1.0"
+    version: "0.2.0"
     repository: "file://../karte"
     alias: karte-dev
     condition: karte-dev.multiEnv
diff --git a/karte/helm/karte-umbrella/multi-env-values.yaml b/karte/helm/karte-umbrella/multi-env-values.yaml
index 3f985fb..fc5b3e1 100644
--- a/karte/helm/karte-umbrella/multi-env-values.yaml
+++ b/karte/helm/karte-umbrella/multi-env-values.yaml
@@ -7,6 +7,8 @@ karte-prod:
   service:
     assertsEnvironment: "prod"
     assertsSite: "us-west-2"
+  postgres:
+    enabled: false
 
   # These services are not directly used in the demo story, but they all talk to each other and serve to add some
   # complexity to the graph.
@@ -24,7 +26,7 @@ karte-prod:
   problemStateEnabled: true
 
 karte-dev:
-  multiEnv: true
+  multiEnv: false
   namespaceOverride: "karte-dev"
   service:
     assertsEnvironment: "dev"
@@ -90,3 +92,4 @@ kube-prometheus-stack:
          regex: "karte-dev"
          replacement: us-west-2
          targetLabel: asserts_site
+
diff --git a/karte/helm/karte-umbrella/values.yaml b/karte/helm/karte-umbrella/values.yaml
index 3fc6e2f..6bf4099 100644
--- a/karte/helm/karte-umbrella/values.yaml
+++ b/karte/helm/karte-umbrella/values.yaml
@@ -165,28 +165,3 @@ fluent-bit:
           Gelf_Host_Key           stream
           Gelf_Short_Message_Key  log_proc_message
 
-postgresql:
-  postgresqlDatabase: "karte"
-  postgresqlPassword: "F.t7oQs*aWfHYjzB_qvG7upjM!hXb9g*!"
-  metrics:
-    enabled: true
-    serviceMonitor:
-      enabled: true
-      additionalLabels:
-        release: "karte-eks"
-      relabelings:
-        - action: replace
-          sourceLabels: [job]
-          replacement: "karte-eks-postgresql"
-          targetLabel: "job"
-      metricRelabelings:
-        - action: replace
-          sourceLabels: [namespace]
-          regex: "default"
-          replacement: "prod"
-          targetLabel: "asserts_env"
-        - action: replace
-          sourceLabels: [ namespace ]
-          regex: "default"
-          replacement: "us-west-2"
-          targetLabel: "asserts_site"
diff --git a/karte/helm/karte/Chart.yaml b/karte/helm/karte/Chart.yaml
index bc7641e..8eaef1d 100644
--- a/karte/helm/karte/Chart.yaml
+++ b/karte/helm/karte/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: karte
 description: A demo application for Asserts
 type: application
-version: 0.1.0
+version: 0.2.0
 appVersion: latest
diff --git a/karte/helm/karte/templates/additional-services.yaml b/karte/helm/karte/templates/additional-services.yaml
index fb84dcd..1cc95ac 100644
--- a/karte/helm/karte/templates/additional-services.yaml
+++ b/karte/helm/karte/templates/additional-services.yaml
@@ -48,7 +48,7 @@ metadata:
     service: {{ . }}
 spec:
   {{- if not $.Values.autoscaling.enabled }}
-  replicas: {{ $.Values.replicaCount }}
+  replicas: {{ $.Values.additionalServicesReplicaCount }}
   {{- end }}
   selector:
     matchLabels:
diff --git a/karte/helm/karte/values.yaml b/karte/helm/karte/values.yaml
index 0dee2a1..0384c54 100644
--- a/karte/helm/karte/values.yaml
+++ b/karte/helm/karte/values.yaml
@@ -2,7 +2,8 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 1
+replicaCount: 0
+additionalServicesReplicaCount: 1
 
 image:
   repository: 543343501704.dkr.ecr.us-west-2.amazonaws.com/ai.asserts.karte
@@ -86,6 +87,6 @@ tenant:
     enabled: false
 
 postgres:
-  enabled: true
+  enabled: false
 
 multiEnv: false