From 43f186fb077ab2a68f0e7f717b2eb77c4fb69741 Mon Sep 17 00:00:00 2001
From: pvannierop <pim@thehyve.nl>
Date: Wed, 22 Jan 2025 08:40:38 +0100
Subject: [PATCH] Decouple monitoring from dev deployment

---
 .github/workflows/push.yaml | 6 +++---
 environments.yaml.tmpl      | 1 -
 etc/base.yaml               | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index a3ab298f..4f571c52 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -46,7 +46,9 @@ jobs:
           helmfile_mods+='\ \ \ \ \ \ - ../.github/ci_config/secrets.yaml.gotmpl'
           sed -i "/secrets.yaml/a $helmfile_mods" environments.yaml
           sed -i '/_install: /s/false/true/' etc/production.yaml
+          # Deploy a minimal deployment accessible on 'localhost:80' with monitoring enabled
           sed -i '/enable_logging_monitoring: /s/false/true/' etc/production.yaml
+          sed -i '/dev_deployment: /s/false/true/' etc/production.yaml
           sed -i '/e2e_test: /s/false/true/' etc/production.yaml
 
   test-helmfile-template:
@@ -99,9 +101,7 @@ jobs:
       - name: Run end-to-end tests
         run: |
           cd test/features
-          behave -D secrets_file=$GITHUB_WORKSPACE/etc/secrets.yaml -D url=https://example.com
-
-      # Enable tmate debugging of manually-triggered workflows if the input option was provided
+          behave -D secrets_file=$GITHUB_WORKSPACE/etc/secrets.yaml -D url=http://localhost:80     # Enable tmate debugging of manually-triggered workflows if the input option was provided
       - name: Manually triggered tmate session
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
diff --git a/environments.yaml.tmpl b/environments.yaml.tmpl
index ae556d58..aaef42b1 100644
--- a/environments.yaml.tmpl
+++ b/environments.yaml.tmpl
@@ -13,7 +13,6 @@ environments:
     {{ end }}
     {{ if .Values.dev_deployment }}
       - ../mods/disable_tls.yaml
-      - ../mods/disable_monitoring_logging.yaml
       - ../mods/localdev.yaml
       - ../mods/minimal.yaml
       - ../mods/minimal_kafka.yaml.gotmpl
diff --git a/etc/base.yaml b/etc/base.yaml
index 560853d8..028b5731 100644
--- a/etc/base.yaml
+++ b/etc/base.yaml
@@ -16,8 +16,9 @@ enable_logging_monitoring: false
 # Can be disabled when TLS termination is handled upstream of the on-cluster Nginx reverse proxy.
 enable_tls: true
 
-# Minimal deployment for development (disables TLS, monitoring and logging, sets kafka and minio brokers to 1).
+# Minimal deployment for development (disables TLS, sets kafka and minio brokers to 1 and uses minimal RAM footprint).
 dev_deployment: false
+# E2e test deployment (applies very fast application loop timings for tests).
 e2e_test: false
 
 # --------------------------------------------------------- 00-init.yaml ---------------------------------------------------------