adjustments

Signed-off-by: kiblik <5609770+kiblik@users.noreply.github.com>

Author: kiblik

docs/content/en/open_source/upgrading/2.53.md

@@ -22,7 +22,7 @@ Added Helm chart support for Celery and Django deployments for Horizontal Pod Au
 ##### Renamed values 
 
 HELM values had been changed to the following:
-- `createRedisSecret` → `createValkeySecret` (`createRedisSecret` is still in place to be able to correctly show error message, but it will be removed in the future)
+- `createRedisSecret` → `createValkeySecret`
 - `redis.enabled` → `valkey.enabled`
 - `redis.auth.existingSecret` → `valkey.auth.existingSecret`, plus value is pointing to secret `defectdojo-valkey-specific` now
 - `redis.auth.existingSecretPasswordKey` → `valkey.auth.existingSecretPasswordKey`, plus value is pointing to secret `valkey-password` now
@@ -33,6 +33,8 @@ HELM values had been changed to the following:
 
 The whole subchart is based on [`cloudpirates-valkey`](https://artifacthub.io/packages/helm/cloudpirates-valkey/valkey), so all additional values can be found there.
 
+If an external Redis instance is being used, set the parameter `valkey.enabled` to `False`. The parameters `redisServer` and `redisParams` remain available and function as before. Additionally, `redisScheme` and `redisPort` have been introduced to accommodate users requiring these configurations.
+
 ##### How to migrate to Valkey
 
 0. As always, perform a backup of your instance
@@ -87,4 +89,4 @@ Both `extraAnnotations` and `initializer.podAnnotations` will now be properly ap
 
 Reimport will update existing findings `fix_available` and `fix_version` fields based on the incoming scan report.
 
-There are other special instructions for upgrading to 2.53.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.53.0) for the contents of the release.
+There are no other special instructions for upgrading to 2.53.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.53.0) for the contents of the release.

helm/defectdojo/README.md

@@ -749,6 +749,7 @@ A Helm chart for Kubernetes to install DefectDojo
 | postgresql.primary.podSecurityContext.fsGroup | int | `1001` | fsGroup specification below is not applied if enabled=false. enabled=false is the required setting for OpenShift "restricted SCC" to work successfully. |
 | postgresql.volumePermissions.containerSecurityContext | object | `{"runAsUser":1001}` | if using restricted SCC set runAsUser: "auto" and if running under anyuid SCC - runAsUser needs to match the line above |
 | redisParams | string | `""` | Parameters attached to the redis connection string, defaults to "ssl_cert_reqs=optional" if `redisScheme` is `rediss` |
+| redisPort | int | `6379` | Define the protocol to use with the external Redis instance |
 | redisScheme | string | `"redis"` | Define the protocol to use with the external Redis instance |
 | redisServer | string | `nil` | To use an external Redis instance, set `redis.enabled` to false and set the address here: |
 | revisionHistoryLimit | int | `10` | Allow overriding of revisionHistoryLimit across all deployments. |

helm/defectdojo/templates/_helpers.tpl

@@ -95,6 +95,17 @@ redis
 {{- end -}}
 {{- end -}}
 
+{{- /*
+  Determine the default port to use for Redis.
+*/}}
+{{- define "redis.port" -}}
+{{- if .Values.valkey.enabled -}}
+{{- .Values.valkey.service.port -}}
+{{- else -}}
+{{- .Values.redisPort -}}
+{{- end -}}
+{{- end -}}
+
 {{- /*
   Builds the repository names for use with local or private registries
 */}}

helm/defectdojo/templates/configmap.yaml

@@ -30,8 +30,8 @@ data:
   DD_CELERY_BROKER_SCHEME: {{ template "redis.scheme" . }}
   DD_CELERY_BROKER_USER: ''
   DD_CELERY_BROKER_HOST: {{ template "redis.hostname" . }}
-  DD_CELERY_BROKER_PORT: '{{ .Values.valkey.service.port }}'
-  DD_CELERY_BROKER_PARAMS: '{{ .Values.redisParams | default $defaultBrokerParams }}'
+  DD_CELERY_BROKER_PORT: '{{ template "redis.port" . }}'
+  DD_CELERY_BROKER_PARAMS: '{{ template "redis.params" . }}'
   DD_CELERY_BROKER_PATH: '{{ .Values.celery.path | default "//" }}'
   DD_CELERY_LOG_LEVEL: {{ .Values.celery.logLevel }}
   DD_CELERY_WORKER_POOL_TYPE: {{ .Values.celery.worker.appSettings.poolType | default "solo" }}

helm/defectdojo/values.schema.json

@@ -1324,6 +1324,10 @@
             "description": "Parameters attached to the redis connection string, defaults to \"ssl_cert_reqs=optional\" if `redisScheme` is `rediss`",
             "type": "string"
         },
+        "redisPort": {
+            "description": "Define the protocol to use with the external Redis instance",
+            "type": "integer"
+        },
         "redisScheme": {
             "description": "Define the protocol to use with the external Redis instance",
             "type": "string"

helm/defectdojo/values.yaml

@@ -696,9 +696,6 @@ extraEnv: []
 # ```
 localsettingspy: ""
 
-#
-# External database support.
-#
 # -- Parameters attached to the valkey connection string, defaults to "ssl_cert_reqs=optional" if `valkey.tls.enabled`
 valkeyParams: ""
 #
@@ -710,6 +707,8 @@ redisServer: ~
 # -- Parameters attached to the redis connection string, defaults to "ssl_cert_reqs=optional" if `redisScheme` is `rediss`
 redisParams: ""
 # -- Define the protocol to use with the external Redis instance
+redisPort: 6379
+# -- Define the protocol to use with the external Redis instance
 redisScheme: redis
 #
 # @schema type:[string, null]