From a4d5772be493ee877103a56dc8e9d2d48e06f0e3 Mon Sep 17 00:00:00 2001
From: Anton Ovchinnikov <anton@tonyo.info>
Date: Mon, 16 Jan 2023 17:04:53 +0100
Subject: [PATCH] feat: Update to the latest Helm chart and add new services
 (#42)

---
 deploy/README.md              |  2 ++
 deploy/global.yaml            | 60 ++++++++++++++---------------------
 deploy/meta.yaml              |  5 +++
 deploy/sentry-components.yaml |  4 +++
 4 files changed, 34 insertions(+), 37 deletions(-)
 create mode 100644 deploy/meta.yaml

diff --git a/deploy/README.md b/deploy/README.md
index 0698be2ac6..982f8fa5fb 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -35,6 +35,8 @@ This environment can be used for demos, and should be considered "stable".
 
 You can edit the following files in this directory:
 
+- [`meta.yaml`](./meta.yaml) -- contains various meta configuration about the
+  deployment, e.g. the currently used version of the Helm chart.
 - [`sentry-components.yaml`](./sentry-components.yaml) -- a list of components
   that have Sentry instrumentation. If some service there is commented out, that
   means that the vanilla version of the service (meaning, a prebuilt Docker image)
diff --git a/deploy/global.yaml b/deploy/global.yaml
index c0a8a8b9dc..0103954a12 100644
--- a/deploy/global.yaml
+++ b/deploy/global.yaml
@@ -11,6 +11,7 @@ observability:
     enabled: true
 
 prometheus:
+  # TODO(tonyo): run in the otel nodepool
   rbac:
     create: false
   serverFiles:
@@ -25,11 +26,13 @@ prometheus:
             - targets:
                 - "otel-demo-otelcol:8888"
 grafana:
+  # TODO(tonyo): run in the otel nodepool
   rbac:
     create: false
     pspEnabled: false
 
 jaeger:
+  # TODO(tonyo): run in the otel nodepool
   allInOne:
     resources:
       requests:
@@ -50,56 +53,44 @@ default:
 
 # Demo components
 components:
+  # Main services
+
+  accountingService:
+    resources:
+      requests:
+        cpu: 50m
   adService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      # Here and below: this is a workaround for an existing issue in the Helm chart (to be fixed).
-      # The final values for nodeSelector and tolerations will still be takend from "default".
-      nodeSelector: {}
   cartService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   checkoutService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   currencyService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   emailService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   featureflagService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
-  ffsPostgres:
+  frauddetectionService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   frontend:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   frontendProxy:
     resources:
       requests:
@@ -107,47 +98,42 @@ components:
         memory: 100Mi
       limits:
         memory: 100Mi
-    schedulingRules:
-      nodeSelector: {}
   loadgenerator:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   paymentService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   productCatalogService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   quoteService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
   recommendationService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
-  redis:
+  shippingService:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
-  shippingService:
+
+  # Supporting services and data storages
+
+  ffsPostgres:
+    resources:
+      requests:
+        cpu: 50m
+  kafka:
+    resources:
+      requests:
+        cpu: 50m
+  redis:
     resources:
       requests:
         cpu: 50m
-    schedulingRules:
-      nodeSelector: {}
diff --git a/deploy/meta.yaml b/deploy/meta.yaml
new file mode 100644
index 0000000000..f12c5efc60
--- /dev/null
+++ b/deploy/meta.yaml
@@ -0,0 +1,5 @@
+# This configuration file contains meta information for the Sentry-specific opentelemetry-demo deployments.
+
+# Version of the Helm chart to use.
+# Chart: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-demo
+helm_chart_version: "0.15.4"
diff --git a/deploy/sentry-components.yaml b/deploy/sentry-components.yaml
index 46ecc0cef4..cdb3434232 100644
--- a/deploy/sentry-components.yaml
+++ b/deploy/sentry-components.yaml
@@ -11,6 +11,8 @@
 #
 ---
 components:
+  # accountingService: {}
+
   adService: {}
 
   # cartService: {}
@@ -23,6 +25,8 @@ components:
 
   # featureflagService: {}
 
+  # frauddetectionService: {}
+
   frontend: {}
 
   paymentService: {}