Fix caching Redis configuration

netbox-community · Nov 29, 2021 · 5634761 · 5634761
1 parent cc35dd5
commit 5634761
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: netbox
-version: 4.0.0
+version: 4.0.1
 appVersion: v3.0.11
 description: IP address management (IPAM) and data center infrastructure management (DCIM) tool
 home: https://github.com/bootc/netbox-chart

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -142,11 +142,11 @@ redis_tasks_password
 {{/*
 Name of the Secret that contains the Redis cache password
 */}}
-{{- define "netbox.cacheRedis.secret" -}}
+{{- define "netbox.cachingRedis.secret" -}}
 {{- if .Values.redis.enabled -}}
 {{ include "netbox.redis.fullname" . }}
-{{- else if .Values.cacheRedis.existingSecretName -}}
-{{ .Values.cacheRedis.existingSecretName }}
+{{- else if .Values.cachingRedis.existingSecretName -}}
+{{ .Values.cachingRedis.existingSecretName }}
 {{- else -}}
 {{ .Values.existingSecret | default (include "netbox.fullname" .) }}
 {{- end -}}
@@ -155,11 +155,11 @@ Name of the Secret that contains the Redis cache password
 {{/*
 Name of the key in Secret that contains the Redis cache password
 */}}
-{{- define "netbox.cacheRedis.secretKey" -}}
+{{- define "netbox.cachingRedis.secretKey" -}}
 {{- if .Values.redis.enabled -}}
 redis-password
-{{- else if .Values.cacheRedis.existingSecretName -}}
-{{ .Values.cacheRedis.existingSecretKey }}
+{{- else if .Values.cachingRedis.existingSecretName -}}
+{{ .Values.cachingRedis.existingSecretKey }}
 {{- else -}}
 redis_cache_password
 {{- end -}}

diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml
@@ -133,9 +133,9 @@ spec:
                         - key: {{ include "netbox.tasksRedis.secretKey" . | quote }}
                           path: redis_tasks_password
                   - secret:
-                      name: {{ include "netbox.cacheRedis.secret" . | quote }}
+                      name: {{ include "netbox.cachingRedis.secret" . | quote }}
                       items:
-                        - key: {{ include "netbox.cacheRedis.secretKey" . | quote }}
+                        - key: {{ include "netbox.cachingRedis.secretKey" . | quote }}
                           path: redis_cache_password
             {{- include "netbox.extraConfig.volumes" . | nindent 12 -}}
             - name: netbox-tmp

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -176,9 +176,9 @@ spec:
                     - key: {{ include "netbox.tasksRedis.secretKey" . | quote }}
                       path: redis_tasks_password
               - secret:
-                  name: {{ include "netbox.cacheRedis.secret" . | quote }}
+                  name: {{ include "netbox.cachingRedis.secret" . | quote }}
                   items:
-                    - key: {{ include "netbox.cacheRedis.secretKey" . | quote }}
+                    - key: {{ include "netbox.cachingRedis.secretKey" . | quote }}
                       path: redis_cache_password
         {{- include "netbox.extraConfig.volumes" . | nindent 8 -}}
         - name: netbox-tmp

diff --git a/templates/worker-deployment.yaml b/templates/worker-deployment.yaml
@@ -135,9 +135,9 @@ spec:
                     - key: {{ include "netbox.tasksRedis.secretKey" . | quote }}
                       path: redis_tasks_password
               - secret:
-                  name: {{ include "netbox.cacheRedis.secret" . | quote }}
+                  name: {{ include "netbox.cachingRedis.secret" . | quote }}
                   items:
-                    - key: {{ include "netbox.cacheRedis.secretKey" . | quote }}
+                    - key: {{ include "netbox.cachingRedis.secretKey" . | quote }}
                       path: redis_cache_password
         {{- include "netbox.extraConfig.volumes" . | nindent 8 -}}
         - name: netbox-tmp