Skip to content

Commit

Permalink
updated helm chart to allow setting a different port for external red…
Browse files Browse the repository at this point in the history
…is (#8547)

* updated helm values and configmap template to allow setting a different port for external redis

* Update helm/defectdojo/templates/configmap.yaml

Changed to reflect values from dependency charts

Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>

* Update values.yaml

updated example values.yaml for redis port

* Update configmap.yaml

was missing rabbitmq in values path

---------

Co-authored-by: mdebie <mdebie@schubergphilis.com>
Co-authored-by: Charles Neill <1749665+cneill@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 25, 2023
1 parent 0497843 commit 27569fe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion helm/defectdojo/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ data:
DD_CELERY_BROKER_SCHEME: {{ if eq .Values.celery.broker "rabbitmq" }}amqp{{ end }}{{ if eq .Values.celery.broker "redis" }}{{ template "redis.scheme" . }}{{ end }}
DD_CELERY_BROKER_USER: '{{ if eq .Values.celery.broker "rabbitmq" }}user{{ end }}'
DD_CELERY_BROKER_HOST: {{ if eq .Values.celery.broker "rabbitmq" }}{{ template "rabbitmq.hostname" . }}{{ else if eq .Values.celery.broker "redis" }}{{ template "redis.hostname" . }}{{ end }}
DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "rabbitmq" }}5672{{ end }}{{ if eq .Values.celery.broker "redis" }}6379{{ end }}'
DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "rabbitmq" }}{{ .Values.rabbitmq.service.ports.amqp | default "5672" }}{{ end }}{{ if eq .Values.celery.broker "redis" }}{{ .Values.redis.master.service.ports.redis | default "6379" }}{{ end }}'
DD_CELERY_BROKER_PARAMS: '{{ if eq .Values.celery.broker "redis" }}{{- if .Values.redis.transportEncryption.enabled -}}{{ .Values.redis.transportEncryption.params | default "ssl_cert_reqs=optional" }}{{ end }}{{ end }}'
DD_CELERY_BROKER_PATH: '{{ .Values.celery.path | default "//" }}'
DD_CELERY_LOG_LEVEL: {{ .Values.celery.logLevel }}
Expand Down
6 changes: 5 additions & 1 deletion helm/defectdojo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,11 @@ redis:
# To use an external Redis instance, set enabled to false and uncomment
# the line below:
# redisServer: myrediscluster

# To use a different port for Redis (default: 6379) add a port number and uncomment the lines below:
# master:
# service:
# ports:
# redis: xxxx

# To add extra variables not predefined by helm config it is possible to define in extraConfigs block, e.g. below:
# NOTE Do not store any kind of sensitive information inside of it
Expand Down

0 comments on commit 27569fe

Please sign in to comment.