From d2707e8f300897d5884f249a7b5c0d8f6167a314 Mon Sep 17 00:00:00 2001
From: Pim van Nierop <pim@thehyve.nl>
Date: Wed, 3 Jul 2024 14:57:29 +0200
Subject: [PATCH] Make sure ci tests cover all components

Services no longer need to be defined in install-all.yaml.
---
 .github/ci_config/ci-config.yaml   |  57 ++++++++++
 .github/ci_config/install-all.yaml | 166 -----------------------------
 .github/workflows/push.yaml        |   5 +-
 3 files changed, 60 insertions(+), 168 deletions(-)
 create mode 100644 .github/ci_config/ci-config.yaml
 delete mode 100644 .github/ci_config/install-all.yaml

diff --git a/.github/ci_config/ci-config.yaml b/.github/ci_config/ci-config.yaml
new file mode 100644
index 00000000..607eb9b3
--- /dev/null
+++ b/.github/ci_config/ci-config.yaml
@@ -0,0 +1,57 @@
+atomicInstall: false
+base_timeout: 180
+
+elasticsearch:
+  resources:
+    requests:
+      cpu: "100m"
+      memory: "500Mi"
+
+kafka_manager:
+  _install: false
+
+confluent_cloud:
+  enabled: false
+
+cp_kafka:
+  persistence:
+    size: 1Gi
+
+postgresql:
+  primary:
+    resources:
+      requests:
+        cpu: 50m
+    persistence:
+      size: 1Gi
+
+radar_appserver_postgresql:
+  primary:
+    resources:
+      requests:
+        cpu: 50m
+    persistence:
+      size: 1Gi
+
+timescaledb:
+  primary:
+    resources:
+      requests:
+        cpu: 50m
+    persistence:
+      size: 1Gi
+
+minio:
+  persistence:
+    size: 1Gi
+
+radar_upload_postgresql:
+  primary:
+    resources:
+      requests:
+        cpu: 50m
+    persistence:
+      size: 1Gi
+
+ccSchemaRegistryProxy:
+  _install: false
diff --git a/.github/ci_config/install-all.yaml b/.github/ci_config/install-all.yaml
deleted file mode 100644
index e6b961f5..00000000
--- a/.github/ci_config/install-all.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-atomicInstall: false
-base_timeout: 180
-
-mongodb:
-  _install: true
-
-elasticsearch:
-  _install: true
-  resources:
-    requests:
-      cpu: "100m"
-      memory: "500Mi"
-
-graylog:
-  _install: true
-
-fluent_bit:
-  _install: true
-
-cert_manager:
-  _install: true
-
-kube_prometheus_stack:
-  _install: true
-
-nginx_ingress:
-  _install: true
-
-kafka_manager:
-  _install: false
-
-cert_manager_letsencrypt:
-  _install: true
-
-confluent_cloud:
-  enabled: false
-
-cp_zookeeper:
-  _install: true
-
-cp_kafka:
-  _install: true
-  persistence:
-    size: 1Gi
-
-cp_schema_registry:
-  _install: true
-
-catalog_server:
-  _install: true
-
-postgresql:
-  _install: true
-  primary:
-    resources:
-      requests:
-        cpu: 50m
-    persistence:
-      size: 1Gi
-
-management_portal:
-  _install: true
-
-app_config:
-  _install: true
-
-app_config_frontend:
-  _install: true
-
-radar_appserver_postgresql:
-  _install: true
-  primary:
-    resources:
-      requests:
-        cpu: 50m  
-    persistence:
-      size: 1Gi
-
-radar_appserver:
-  _install: true
-
-radar_fitbit_connector:
-  _install: true
-
-radar_rest_sources_authorizer:
-  _install: true
-
-radar_rest_sources_backend:
-  _install: true
-
-timescaledb:
-  _install: true
-  primary:
-    resources:
-      requests:
-        cpu: 50m
-    persistence:
-      size: 1Gi
-
-radar_grafana:
-  _install: true
-
-radar_jdbc_connector:
-  _install: true
-
-radar_gateway:
-  _install: true
-
-radar_backend_monitor:
-  _install: true
-
-radar_backend_stream:
-  _install: true
-
-radar_integration:
-  _install: true
-
-redis:
-  _install: true
-
-minio:
-  _install: true
-  persistence:
-    size: 1Gi
-
-radar_s3_connector:
-  _install: true
-
-s3_proxy:
-  _install: true
-
-radar_output:
-  _install: true
-
-radar_upload_postgresql:
-  _install: true
-  primary:
-    resources:
-      requests:
-        cpu: 50m
-    persistence:
-      size: 1Gi
-
-radar_upload_connect_backend:
-  _install: true
-
-radar_upload_connect_frontend:
-  _install: true
-
-radar_upload_source_connector:
-  _install: true
-
-ccSchemaRegistryProxy:
-  _install: false
-
-radar_push_endpoint:
-  _install: true
-
-radar_jdbc_connector_agg:
-  _install: true
-
-ksql_server:
-  _install: true
-
-velero:
-  _install: true
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
index eb2a0a27..9d8ef4ae 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -47,10 +47,11 @@ jobs:
         run: |
           ./.github/ci_config/bin/install-dependencies
 
-      - name: Prepare the environment
+      - name: Prepare the environment (add secrets and enable installation of all components)
         run: |
           DNAME='CN=CI,O=TheHyve,L=Utrecht,C=NL' ./bin/init
-          yq -i -f process '.environments.default.values += ["../.github/ci_config/install-all.yaml", "../.github/ci_config/secrets.yaml.gotmpl"]' environments.yaml
+          yq -i -f process '.environments.default.values += ["../.github/ci_config/ci-config.yaml", "../.github/ci_config/secrets.yaml.gotmpl"]' environments.yaml
+          sed -i '/_install: /s/false/true/' etc/production.yaml
 
       - name: Run helmfile template
         env: