fix: ha on mongodb

Author: devthejo

charts/no-package-malware/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: mongodb
-  repository: https://cloudpirates-io.github.io/helm-charts
-  version: 0.6.6
+  repository: https://groundhog2k.github.io/helm-charts/
+  version: 0.7.6
 - name: valkey
   repository: https://cloudpirates-io.github.io/helm-charts
   version: 0.10.3
-digest: sha256:8a6b533942832deab6ba228fd6f94a665609601d19f02e80c19fd81f2fe494ea
-generated: "2025-12-03T16:48:29.358826904+01:00"
+digest: sha256:b6e79bcd1fade97969b990ce190ec6fc1a696b196d11e4278577164e102028b8
+generated: "2025-12-03T18:59:17.633294114+01:00"

charts/no-package-malware/Chart.yaml

@@ -19,13 +19,12 @@ sources:
 maintainers:
   - name: SocialGouv
 
-# MongoDB and Valkey subcharts for HA setups (CloudPirates charts)
+# MongoDB and Valkey subcharts for HA setups
 dependencies:
   - name: mongodb
-    alias: mongodbha
-    version: 0.6.6
-    repository: https://cloudpirates-io.github.io/helm-charts
-    condition: mongodbha.enabled
+    version: 0.7.6
+    repository: https://groundhog2k.github.io/helm-charts/
+    condition: mongodb.enabled
   - name: valkey
     alias: valkeyha
     version: 0.10.3

charts/no-package-malware/charts/mongodb-0.6.6.tgz

@@ -39,3 +39,18 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 "no-package-malware.local"
 {{- end -}}
 {{- end -}}
+
+{{/* Build a MongoDB replica set connection URI for the embedded mongodb subchart */}}
+{{- define "no-package-malware.mongodb.replUri" -}}
+{{- $name := printf "%s-mongodb" .Release.Name -}}
+{{- $svcSuffix := default "internal" .Values.mongodb.service.headlessServiceSuffix -}}
+{{- $replName := default "repl" .Values.mongodb.replicaSet.name -}}
+{{- $secondaries := int (default 0 .Values.mongodb.replicaSet.secondaries) -}}
+{{- $members := add 1 $secondaries -}} {{/* primary + secondaries */}}
+{{- $hosts := list -}}
+{{- range $i, $_ := until $members -}}
+  {{- $host := printf "%s-%d.%s-%s:27017" $name $i $name $svcSuffix -}}
+  {{- $hosts = append $hosts $host -}}
+{{- end -}}
+{{- printf "mongodb://%s/?replicaSet=%s" (join "," $hosts) $replName -}}
+{{- end -}}

charts/no-package-malware/charts/mongodb-0.7.6.tgz

@@ -31,13 +31,16 @@ spec:
           imagePullPolicy: {{ .Values.image.api.pullPolicy }}
           env:
             {{/* Derive Mongo and Valkey connection settings with sensible defaults.
-                 Defaults point at the CloudPirates subcharts (mongodbha / valkeyha)
+                 Defaults point at the embedded subcharts (mongodb / valkeyha)
                  but can be overridden via .Values.mongo.uri and .Values.valkey.*
                  for external clusters. */}}
             {{- $release := .Release.Name }}
 
-            {{- $mongoDefaultHost := printf "%s-mongodbha" $release }}
-            {{- $mongoDefaultUri := printf "mongodb://%s:27017" $mongoDefaultHost }}
+            {{- /* Default Mongo URI: in-cluster mongodb service when enabled */ -}}
+            {{- $mongoDefaultUri := printf "mongodb://%s-mongodb:27017" $release }}
+            {{- if and .Values.mongodb.enabled .Values.mongodb.replicaSet.enabled }}
+              {{- $mongoDefaultUri = include "no-package-malware.mongodb.replUri" . }}
+            {{- end }}
             {{- $mongoUri := default $mongoDefaultUri .Values.mongo.uri }}
 
             {{- $valkeyDefaultHost := printf "%s-valkeyha" $release }}
@@ -52,7 +55,7 @@ spec:
             - name: SECURITY_DB_URI
               value: {{ $mongoUri | quote }}
             - name: SECURITY_DB_NAME
-              value: {{ .Values.app.securityDbName | quote }}
+              value: {{ .Values.mongo.dbName | quote }}
             - name: REDIS_URL
               value: {{ printf "redis://%s:%d" $valkeyHost (int $valkeyPort) | quote }}
             - name: AUDIT_RATE_LIMIT_REDIS_URL

charts/no-package-malware/templates/_helpers.tpl

@@ -17,8 +17,6 @@ image:
 
 # Global settings for the application.
 app:
-  securityDbName: secure_registry
-
   ports:
     decisionApi: 4000
     accessAdminApi: 4100
@@ -46,6 +44,16 @@ app:
   registryStrictUrl: "http://localhost:4873"
   registryLenientUrl: "http://localhost:4874"
 
+# MongoDB connection settings used by the application.
+mongo:
+  # Connection URI for MongoDB.
+  # Must be set in environment-specific values (dev/prod) if you want a DB.
+  # If left empty and mongodb.enabled=true, we’ll default to the in-cluster mongodb service.
+  uri: ""
+
+  # Logical database name for the app
+  dbName: secure_registry
+
 # Admin credentials for the access-admin API (login to the admin dashboard)
 accessAdmin:
   # Default bootstrap credentials (dev/demo only). These are only used when
@@ -81,14 +89,6 @@ openai:
     # Key in the secret that stores the API key.
     secretKey: OPENAI_API_KEY
 
-# MongoDB connection used by the application.
-# MongoDB itself is provided by the CloudPirates mongodb subchart (mongodbha)
-# or by an external service.
-mongo:
-  # Connection URI for MongoDB.
-  # Defaults to mongodb://<release>-mongodbha:27017 when empty and mongodbha.enabled=true.
-  uri: ""
-
 # Valkey (Redis-compatible) connection used by the application.
 # Valkey itself is provided by the CloudPirates valkey subchart (valkeyha)
 # or by an external service.
@@ -105,13 +105,37 @@ valkey:
     host: ""
     port: 26379
 
-# CloudPirates MongoDB subchart configuration (see charts/mongodb values for details).
+# Groundhog2k MongoDB subchart configuration (see charts/mongodb values for details).
 # Enable this to deploy MongoDB as part of this release.
-mongodbha:
+mongodb:
   enabled: false
-  replicaCount: 1
-  auth:
+
+  # High-availability / replica set mode.
+  replicaSet:
     enabled: false
+    name: repl
+    secondaries: 2
+    arbiter:
+      enabled: false
+
+  # Storage configuration for primary and all secondaries.
+  storage:
+    requestedSize: 10Gi
+    className: ""
+    accessModes:
+      - ReadWriteOnce
+    keepPvc: false
+
+  # Optional authentication (disabled by default).
+  settings:
+    rootUsername: ""
+    rootPassword: ""
+
+  # Optional user database created on first start-up.
+  userDatabase: {}
+  #  name: secure_registry
+  #  user: app
+  #  password: change-me
 
 # CloudPirates Valkey subchart configuration (see charts/valkey values for details).
 # Enable this to deploy Valkey as part of this release.