Fix caCertData to use root data object instead of current context

netbox-community · Aug 12, 2024 · e17c7bf · e17c7bf
1 parent 9108ce9
commit e17c7bf
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/charts/netbox/templates/configmap.yaml b/charts/netbox/templates/configmap.yaml
@@ -293,7 +293,7 @@ data:
     AUTH_LDAP_BIND_DN: {{ $.Values.remoteAuth.ldap.bindDn | quote }}
     AUTH_LDAP_START_TLS: {{ toJson $.Values.remoteAuth.ldap.startTls }}
     LDAP_IGNORE_CERT_ERRORS: {{ toJson $.Values.remoteAuth.ldap.ignoreCertErrors }}
-    {{- if .Values.remoteAuth.ldap.caCertData }}
+    {{- if $.Values.remoteAuth.ldap.caCertData }}
     LDAP_CA_CERT_FILE: /etc/netbox/config/ldap/ldap_ca.crt
     {{- end }}
     AUTH_LDAP_USER_DN_TEMPLATE: {{ default nil $.Values.remoteAuth.ldap.userDnTemplate }}
@@ -307,9 +307,9 @@ data:
     AUTH_LDAP_MIRROR_GROUPS: {{ toJson $.Values.remoteAuth.ldap.mirrorGroups }}
     AUTH_LDAP_MIRROR_GROUPS_EXCEPT: {{ toJson $.Values.remoteAuth.ldap.mirrorGroupsExcept }}
     AUTH_LDAP_CACHE_TIMEOUT: {{ int $.Values.remoteAuth.ldap.cacheTimeout }}
-  {{- if .Values.remoteAuth.ldap.caCertData }}
+  {{- if $.Values.remoteAuth.ldap.caCertData }}
   ldap_ca.crt: |-
-    {{- toYaml .Values.remoteAuth.ldap.caCertData | nindent 4 }}
+    {{- toYaml $.Values.remoteAuth.ldap.caCertData | nindent 4 }}
   {{- end }}
   {{- end }}
   {{- end }}

diff --git a/charts/netbox/templates/cronjob.yaml b/charts/netbox/templates/cronjob.yaml
@@ -70,7 +70,7 @@ spec:
               mountPath: /etc/netbox/config/ldap/ldap_config.py
               subPath: ldap_config.py
               readOnly: true
-            {{- if .Values.remoteAuth.ldap.caCertData }}
+            {{- if $.Values.remoteAuth.ldap.caCertData }}
             - name: config
               mountPath: /etc/netbox/config/ldap/ldap_ca.crt
               subPath: ldap_ca.crt

diff --git a/charts/netbox/templates/deployment.yaml b/charts/netbox/templates/deployment.yaml
@@ -160,7 +160,7 @@ spec:
           mountPath: /etc/netbox/config/ldap/ldap_config.py
           subPath: ldap_config.py
           readOnly: true
-        {{- if .Values.remoteAuth.ldap.caCertData }}
+        {{- if $.Values.remoteAuth.ldap.caCertData }}
         - name: config
           mountPath: /etc/netbox/config/ldap/ldap_ca.crt
           subPath: ldap_ca.crt

diff --git a/charts/netbox/templates/worker-deployment.yaml b/charts/netbox/templates/worker-deployment.yaml
@@ -76,7 +76,7 @@ spec:
           mountPath: /etc/netbox/config/ldap/ldap_config.py
           subPath: ldap_config.py
           readOnly: true
-        {{- if .Values.remoteAuth.ldap.caCertData }}
+        {{- if $.Values.remoteAuth.ldap.caCertData }}
         - name: config
           mountPath: /etc/netbox/config/ldap/ldap_ca.crt
           subPath: ldap_ca.crt