Merge pull request #145 from afolarin/test11

Fixes to basic deployment
RADAR-base · Nov 22, 2021 · 4b371fb · 4b371fb
2 parents ad12e95 + f1197c8
commit 4b371fb
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 10 deletions.
diff --git a/base.yaml b/base.yaml
@@ -2,6 +2,7 @@ kubeContext: default
 server_name: example.com
 maintainer_email: [email protected]
 kafka_num_brokers: 3
+postgres_password: password
 
 # --------------------------------------------------------- 00-init.yaml ---------------------------------------------------------
 
@@ -118,7 +119,19 @@ management_portal:
       client_secret: "saturday$SHARE$scale"
     aRMT:
       enable: true
-      client_secret: ""
+      client_secret: secret
+    radar_upload_backend:
+      client_secret: secret
+    radar_upload_connect:
+      client_secret: secret
+    radar_rest_sources_auth_backend:
+      client_secret: secret
+    radar_redcap_integrator:
+      client_secret: secret
+    radar_fitbit_connector:
+      client_secret: secret
+    radar_appconfig:
+      client_secret: secret
   smtp:
     enabled: false
     host: smtp
@@ -138,6 +151,9 @@ app_config_frontend:
   callbackUrl: https://example.com/appconfig/login
 
 # --------------------------------------------------------- 20-fitbit.yaml ---------------------------------------------------------
+fitbit_api_client: fitbit_api_client_id
+fitbit_api_secret: fitbit_api_client_secret
+
 radar_fitbit_connector:
   _install: false
   replicaCount: 1
@@ -233,6 +249,8 @@ minio:
   s3Endpoint: http://minio:9000/
   persistence:
     size: 20Gi
+  accessKey: AKIAIOSFODNN7EXAMPLE
+  secretKey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 
 radar_s3_connector:
   # set to true if radar-s3-connector should be installed
@@ -262,6 +280,14 @@ radar_output:
       bucket: radar-output-storage
   redis:
     uri: redis://redis-master:6379
+  source:
+    s3:
+      accessToken: AKIAIOSFODNN7EXAMPLE
+      secretKey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+  target:
+    s3:
+      accessToken: AKIAIOSFODNN7EXAMPLE
+      secretKey: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 
 # --------------------------------------------------------- 30-confluent-cloud.yaml ---------------------------------------------------------
 
@@ -272,6 +298,12 @@ ccSchemaRegistryProxy:
 # --------------------------------------------------------- 20-grafana.yaml ---------------------------------------------------------
 
 timescaledb_db_name: grafana-metrics
+timescaledb_password: password
+timescaledb_username: postgres
+
+grafana_password: password
+grafana_metrics_username: username
+grafana_metrics_password: password
 
 radar_grafana:
   _install: true

diff --git a/charts/radar-upload-connect-backend/values.yaml b/charts/radar-upload-connect-backend/values.yaml
@@ -75,6 +75,10 @@ resources:
     cpu: 100m
     memory: 2Gi
 
+persistence:
+  enabled: true
+
+
 # -- Node labels for pod assignment
 nodeSelector: {}
 

diff --git a/helmfile.d/20-upload.yaml b/helmfile.d/20-upload.yaml
@@ -39,8 +39,10 @@ releases:
         value: {{ .Values.server_name }}
       - name: postgres.password
         value: {{ .Values.radar_upload_postgres_password }}
+      {{ if hasKey .Values.management_portal.oauth_clients "radar_upload_backend" }}
       - name: client_secret
-        value: {{ if hasKey .Values.management_portal.oauth_clients "radar_upload_backend" -}}{{ .Values.management_portal.oauth_clients.radar_upload_backend.client_secret }}{{- end }}
+        value: {{ .Values.management_portal.oauth_clients.radar_upload_backend.client_secret }}
+      {{ end }}
 
   - name: radar-upload-connect-frontend
     chart: ../charts/radar-upload-connect-frontend
@@ -67,5 +69,7 @@ releases:
         value: {{ .Values.minio.accessKey }}
       - name: bucketSecretKey
         value: {{ .Values.minio.secretKey }}
+      {{ if hasKey .Values.management_portal.oauth_clients "radar_upload_connect" }}
       - name: client_secret
-        value: {{ if hasKey .Values.management_portal.oauth_clients "radar_upload_connect" -}}{{ .Values.management_portal.oauth_clients.radar_upload_connect.client_secret }}{{- end }}
+        value: {{ .Values.management_portal.oauth_clients.radar_upload_connect.client_secret }}
+      {{ end }}
diff --git a/helmfile.d/30-confluent-cloud.yaml b/helmfile.d/30-confluent-cloud.yaml
@@ -1,10 +1,7 @@
-environments:
-  default:
-    values:
-      - ../base.yaml
-      - ../../etc/production.yaml
-    secrets:
-      - ../../secrets/production.yaml
+bases:
+- ../environments.yaml
+
+---
 
 helmDefaults:
   atomic: true