Merge pull request #99 from amal-k-soman-aot/master

updated postgresql, mongodb and configured chart
AOT-Technologies · Aug 19, 2024 · 0cd16b9 · 0cd16b9
2 parents cd52cc2 + 1cf6a59
commit 0cd16b9
Show file tree

Hide file tree

Showing 29 changed files with 68 additions and 83 deletions.
diff --git a/Notes.md b/Notes.md
@@ -1,8 +1,8 @@
-# 🚨 Important Notice: Upgrade Impact on forms-flow-ai-charts (Helm) v7.0.4
+# 🚨 Important Notice: Upgrade Impact on forms-flow-ai-charts (Helm) v7.1.0
 
 ## Key Points:
 
-1. **Database Backup**: The latest upgrade (v7.0.4) will affect existing data. Please ensure you backup your database before proceeding with the upgrade.
+1. **Database Backup**: The latest upgrade (v7.1.0) will affect existing data. Please ensure you backup your database before proceeding with the upgrade.
 
 2. **Environment Changes**: Changes to the environment variables will not affect the deployment unless there are modifications to the database.
 

diff --git a/charts/forms-flow-admin/Chart.yaml b/charts/forms-flow-admin/Chart.yaml
@@ -3,4 +3,4 @@ apiVersion: v2
 name: forms-flow-admin
 tags: forms-flow-admin
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
-version: v7.0.4
+version: v7.1.0
diff --git a/charts/forms-flow-admin/values.yaml b/charts/forms-flow-admin/values.yaml
@@ -7,7 +7,7 @@ postgresql:
   password: "postgres"
   port: 5432
   host: "forms-flow-ai-postgresql-ha-pgpool"
-  url: "postgresql://${DATABASE_USERNAME}:${DATABASE_PASSWORD}@${DATABASE_HOST}:5432/${DATABASE_NAME}"
+  url: "postgresql://{{.Values.postgresql.username}}:{{.Values.postgresql.password}}@{{.Values.postgresql.host}}:{{.Values.postgresql.port}}/{{.Chart.Name}}"
 ExternalDatabase:
   ExistingDatabaseNameKey: ""
   ExistingDatabaseUserNameKey: ""

diff --git a/charts/forms-flow-ai/Chart.yaml b/charts/forms-flow-ai/Chart.yaml
@@ -10,7 +10,8 @@ dependencies:
     condition: mongodb.enabled 
     repository: https://charts.bitnami.com/bitnami
     version: 15.6.18
-  - name: redis-exporter
-    version: v3.0.0
-version: v7.0.5
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 2.x.x
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ai/charts/redis-exporter/Chart.yaml b/charts/forms-flow-ai/charts/redis-exporter/Chart.yaml
diff --git a/charts/forms-flow-ai/charts/redis-exporter/values.yaml b/charts/forms-flow-ai/charts/redis-exporter/values.yaml
diff --git a/...s/redis-exporter/templates/configmap.yaml → ...i/templates/redis-exporter/configmap.yaml b/...s/redis-exporter/templates/configmap.yaml → ...i/templates/redis-exporter/configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 data:
-  redis.conf: {{ .Values.redis.configMap.redis_conf | quote }}
+  redis.conf: {{ .Values.redisExporter.redis.configMap.redis_conf | quote }}
   update-node.sh: |
     #!/bin/sh
     CLUSTER_CONFIG="/data/nodes.conf"
@@ -21,5 +21,5 @@ data:
 kind: ConfigMap
 metadata:
   labels:
-    app: {{ .Chart.Name }}
-  name: {{ .Chart.Name }}
+    app: redis-exporter
+  name: redis-exporter
diff --git a/...rts/redis-exporter/templates/service.yaml → ...-ai/templates/redis-exporter/service.yaml b/...rts/redis-exporter/templates/service.yaml → ...-ai/templates/redis-exporter/service.yaml
@@ -2,8 +2,8 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: {{ .Chart.Name }}
-  name: {{ .Chart.Name }}
+    app: redis-exporter
+  name: redis-exporter
 spec:
   ports:
   - name: client
@@ -13,5 +13,5 @@ spec:
     port: 16379
     targetPort: 16379
   selector:
-    app: {{ .Chart.Name }}
+    app: redis-exporter
   type: ClusterIP
diff --git a/...redis-exporter/templates/statefulset.yaml → ...templates/redis-exporter/statefulset.yaml b/...redis-exporter/templates/statefulset.yaml → ...templates/redis-exporter/statefulset.yaml
@@ -2,18 +2,18 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    app: {{ .Chart.Name }}
-  name: {{ .Chart.Name }}
+    app: redis-exporter
+  name: redis-exporter
 spec:
-  replicas: {{ .Values.exporter.replica }}
+  replicas: {{ .Values.redisExporter.replica }}
   selector:
     matchLabels:
-      app: {{ .Chart.Name }}
-  serviceName: {{ .Chart.Name }}
+      app: redis-exporter
+  serviceName: redis-exporter
   template:
     metadata:
       labels:
-        app: {{ .Chart.Name }}
+        app: redis-exporter
     spec:
       containers:
       - name: redis
@@ -22,7 +22,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: "{{ .Values.redis.image.registry }}/{{ .Values.redis.image.repository }}:{{ .Values.redis.image.tag }}"
+        image: "{{ .Values.redisExporter.redis.image.registry }}/{{ .Values.redisExporter.redis.image.repository }}:{{ .Values.redisExporter.redis.image.tag }}"
         command: ["/conf/update-node.sh", "redis-server", "/conf/redis.conf"]
         livenessProbe:
           failureThreshold: 5
@@ -47,11 +47,11 @@ spec:
           timeoutSeconds: 5
         resources:
           limits:
-            cpu: "{{ .Values.resources.limits.cpu }}"
-            memory: "{{ .Values.resources.limits.memory }}"
+            cpu: "{{ .Values.redisExporter.resources.limits.cpu }}"
+            memory: "{{ .Values.redisExporter.resources.limits.memory }}"
           requests:
-            cpu: "{{ .Values.resources.requests.cpu }}"
-            memory: "{{ .Values.resources.requests.memory }}"
+            cpu: "{{ .Values.redisExporter.resources.requests.cpu }}"
+            memory: "{{ .Values.redisExporter.resources.requests.memory }}"
         volumeMounts:
         - mountPath: /conf
           name: conf
@@ -62,7 +62,7 @@ spec:
       volumes:
       - configMap:
           defaultMode: 0555
-          name: {{ .Chart.Name }}
+          name: redis-exporter
         name: conf
 
   volumeClaimTemplates:
@@ -73,5 +73,5 @@ spec:
       - ReadWriteOnce
       resources:
         requests:
-          storage: {{ .Values.persistentVolumeClaim.size }}
-      storageClassName: {{ .Values.persistentVolumeClaim.storageClass }}
+          storage: {{ .Values.redisExporter.persistentVolumeClaim.size }}
+      storageClassName: {{ .Values.redisExporter.persistentVolumeClaim.storageClass }}
diff --git a/charts/forms-flow-ai/values.yaml b/charts/forms-flow-ai/values.yaml
@@ -195,7 +195,7 @@ postgresql-ha:
     image:
       registry: docker.io
       repository: bitnami/pgpool
-      tag: 4.5.2-debian-12-r0
+      tag: 4.5.2-debian-12-r5
       digest: ""
       pullPolicy: IfNotPresent
     replicaCount: 1
@@ -233,9 +233,8 @@ postgresql-ha:
     portName: postgresql
     nodePorts:
       postgresql: ""
-redis-expoter:
-  exporter:
-    replica: 2
+redisExporter:
+  replica: 1
   redis:
     configMap:
       redis_conf: |
@@ -247,3 +246,18 @@ redis-expoter:
         appendonly no
         protected-mode no
         maxmemory 1449551462
+    image:  
+      registry: docker.io
+      repository: redis
+      tag: 7.2.4-alpine
+
+  persistentVolumeClaim:
+    size: 2Gi 
+    storageClass: ""
+  resources:
+    limits:
+      cpu: 60m
+      memory: 512Mi
+    requests:
+      cpu: 50m
+      memory: 256Mi
diff --git a/charts/forms-flow-analytics/Chart.yaml b/charts/forms-flow-analytics/Chart.yaml
@@ -2,5 +2,5 @@
 apiVersion: v2
 name: forms-flow-analytics
 tags: forms-flow-analytics
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-api/Chart.yaml b/charts/forms-flow-api/Chart.yaml
@@ -2,5 +2,5 @@
 apiVersion: v2
 name: forms-flow-api
 tags: forms-flow-api
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-api/values.yaml b/charts/forms-flow-api/values.yaml
@@ -7,7 +7,7 @@ database:
   dbName: "forms-flow-api"
   host: "forms-flow-ai-postgresql-ha-pgpool"
   port: 5432
-  url: "postgresql://${FORMSFLOW_API_DB_USER}:${FORMSFLOW_API_DB_PASSWORD}@${FORMSFLOW_API_HOSTNAME}:5432/${FORMSFLOW_API_DB_NAME}"
+  url: "postgresql://{{.Values.database.username}}:{{.Values.database.password}}@{{.Values.database.host}}:{{.Values.database.port}}/{{.Chart.Name}}"
 ExternalDatabase:
   ExistingDatabaseNameKey: ""
   ExistingDatabaseUserNameKey: ""

diff --git a/charts/forms-flow-bpm/Chart.yaml b/charts/forms-flow-bpm/Chart.yaml
@@ -1,5 +1,5 @@
 ---
 apiVersion: v2
 name: forms-flow-bpm
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-data-analysis/Chart.yaml b/charts/forms-flow-data-analysis/Chart.yaml
@@ -2,5 +2,5 @@
 apiVersion: v2
 name: forms-flow-data-analysis
 tags: forms-flow-data-analysis
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-documents-api/Chart.yaml b/charts/forms-flow-documents-api/Chart.yaml
@@ -2,5 +2,5 @@
 apiVersion: v2
 name: forms-flow-documents-api
 tags: forms-flow-documents-api
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-forms/Chart.yaml b/charts/forms-flow-forms/Chart.yaml
@@ -1,5 +1,5 @@
 ---
 apiVersion: v2
 name: forms-flow-forms
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-idm/Chart.yaml b/charts/forms-flow-idm/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: forms-flow-idm
-version: v7.0.5
+version: v7.1.0
 dependencies:
   - name: keycloak
     version: 19.1.0
@@ -10,4 +10,7 @@ dependencies:
     condition: postgresql-ha.enabled 
     repository: https://charts.bitnami.com/bitnami
     version: 14.2.16
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    version: 2.x.x
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-idm/values.yaml b/charts/forms-flow-idm/values.yaml
@@ -163,7 +163,7 @@ postgresql-ha:
     image:
       registry: docker.io
       repository: bitnami/pgpool
-      tag: 4.5.2-debian-12-r0
+      tag: 4.5.2-debian-12-r5
       digest: ""
       pullPolicy: IfNotPresent
     replicaCount: 1

diff --git a/charts/forms-flow-ssl/forms-flow-admin/Chart.yaml b/charts/forms-flow-ssl/forms-flow-admin/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-admin
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-analytics/Chart.yaml b/charts/forms-flow-ssl/forms-flow-analytics/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-analytics
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-api/Chart.yaml b/charts/forms-flow-ssl/forms-flow-api/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-api
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-bpm/Chart.yaml b/charts/forms-flow-ssl/forms-flow-bpm/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-bpm
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-data-analysis/Chart.yaml b/charts/forms-flow-ssl/forms-flow-data-analysis/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-data-analysis
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-documents-api/Chart.yaml b/charts/forms-flow-ssl/forms-flow-documents-api/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-documents-api
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-forms/Chart.yaml b/charts/forms-flow-ssl/forms-flow-forms/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-forms
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-idm/Chart.yaml b/charts/forms-flow-ssl/forms-flow-idm/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-idm
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-ssl/forms-flow-web/Chart.yaml b/charts/forms-flow-ssl/forms-flow-web/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: forms-flow-web
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/charts/forms-flow-web/Chart.yaml b/charts/forms-flow-web/Chart.yaml
@@ -1,5 +1,5 @@
 ---
 apiVersion: v2
 name: forms-flow-web
-version: v7.0.4
+version: v7.1.0
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"