Add required dynamic helmfile values

This PR updates helm values files with dynamic parameters required for Exoscale integration * Updated tsdb-connect.js with dynamic postgres port from values * Updated redis template to include dynamic storage from values * Updated environmental values file for above changes Signed-off-by: Abhijith H R <[email protected]>
IndustryFusion · Jul 23, 2024 · 2afc380 · 2afc380
1 parent e258472
commit 2afc380
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/KafkaBridge/timescaledb/utils/tsdb-connect.js b/KafkaBridge/timescaledb/utils/tsdb-connect.js
@@ -21,10 +21,12 @@ const config = require('../../config/config.json');
 var sequelize;
 const postgPassword = process.env.POSTGRES_PASSWORD || config.timescaledb.password;
 const postgHostname = process.env.POSTGRES_SERVICE || config.timescaledb.hostname;
+const postgPort = process.env.POSTGRES_PORT || config.timescaledb.port;
+
 if (config.timescaledb.PGSSLMODE === "require") {
     sequelize = new Sequelize(config.timescaledb.dbname, config.timescaledb.username, postgPassword, {
         host: postgHostname,
-        port: config.timescaledb.port,
+        port: postgPort,
         dialect: 'postgres',
         dialectOptions: {
         ssl: {
@@ -35,7 +37,7 @@ if (config.timescaledb.PGSSLMODE === "require") {
 } else {
     sequelize = new Sequelize(config.timescaledb.dbname, config.timescaledb.username, postgPassword, {
         host: postgHostname,
-        port: config.timescaledb.port,
+        port: postgPort,
         dialect: 'postgres'
     });
 }

diff --git a/helm/charts/redis/templates/redis.yaml b/helm/charts/redis/templates/redis.yaml
@@ -58,4 +58,4 @@ spec:
   - ReadWriteOnce
   resources:
     requests:
-      storage: 2Gi
+      storage: {{ .Values.redis.storage.size }}
diff --git a/helm/environment/default.yaml b/helm/environment/default.yaml
@@ -95,14 +95,18 @@ kafkaBridge:
     tokenRefreshInterval: 200
     listenTopicRetention: 3600000
   timescaledb:
+    postgresPort: 5432
     replicaCount: 1
     tokenRefreshInterval: 200
     listenTopicRetention: 3600000
 
 velero:
   backupBucket: velero-backup
+  region: de
 
 redis:
+  storage:
+    size: 2Gi
   resources:
     requests:
       cpu: 50m

diff --git a/helm/environment/production.yaml b/helm/environment/production.yaml
@@ -97,14 +97,18 @@ kafkaBridge:
     tokenRefreshInterval: 200
     listenTopicRetention: 28800000
   timescaledb:
+    postgresPort: 5432
     replicaCount: 1
     tokenRefreshInterval: 200
     listenTopicRetention: 28800000
 
 velero:
   backupBucket: velero-backup
+  region: de
 
 redis:
+  storage:
+    size: 2Gi
   resources:
     requests:
       cpu: 500m

diff --git a/helm/values.yaml.gotmpl b/helm/values.yaml.gotmpl
@@ -131,12 +131,12 @@ kafka:
   bootstrapServer: my-cluster-kafka-bootstrap:9092
   storage:
     type: persistent-claim
-    size: 5Gi
+    size: {{ .StateValues.kafka.storage.size }}
   zookeeper:
     replicas: 1
     storage:
       type: persistent-claim
-      size: 1Gi
+      size: {{ .StateValues.kafka.zookeeper.storage.size }}
   connect:
     debeziumTopicPrefix: iff.ngsild
     tableIncludeList: public.entity$
@@ -187,6 +187,7 @@ kafkaBridge:
     attributesTopic: "iff.ngsild.attributes"
 
   timescaledb:
+    postgresPort: {{ .StateValues.kafkaBridge.timescaledb.postgresPort }}
     replicaCount: 1
     tokenRefreshInterval: 200
     listenTopic: "iff.ngsild.attributes"
@@ -282,7 +283,7 @@ velero:
       default: true
       accessMode: ReadWrite
       config:
-        region: de
+        region: {{ .StateValues.velero.region }}
         s3Url: {{ if (hasKey $s3 "protocol") }} {{ $s3.protocol }} {{- else }} http{{- end }}://{{ if (hasKey $s3 "endpoint") }}{{ $s3.endpoint }}{{- else }}minio.{{ .StateValues.namespace }}.svc.cluster.local{{- end }}
         s3ForcePathStyle: {{- if .StateValues.minio.enabled }} true {{- else }} false {{- end }}
       defaultVolumesToRestic: true
@@ -307,6 +308,8 @@ velero:
     #    memory: 1024Mi
 
 redis:
+  storage:
+    size: {{ .StateValues.redis.storage.size }}
   resources:
     requests:
       cpu: {{ .StateValues.redis.resources.requests.cpu }}