Change variable to plural "macros" to match plugin name

Author: sei-mkaar

charts/mkdocs-material/templates/_helpers.tpl

@@ -128,16 +128,16 @@ Subpath prefix value to use for pvc mount points
   {{- end }}
   env:
     - name: MKDOCS_ADD_MACROS
-      value: {{ default "false" .Values.macroPlugin.enabled | toString | quote }}
+      value: {{ default "false" .Values.macrosPlugin.enabled | toString | quote }}
     - name: MKDOCS_MACROS_VERSION
-      value: {{ default "1.3.9" .Values.macroPlugin.version | toString | quote }}
+      value: {{ default "1.3.9" .Values.macrosPlugin.version | toString | quote }}
   {{- if .Values.gitPath }}
     - name: DOCS_GIT_PATH
       value: {{ .Values.gitPath | trimPrefix "/" }}
   {{- end }}
   volumeMounts:
-  {{- if and .Values.macroPlugin.enabled .Values.macroPlugin.extraYamlConfig }}
-    - mountPath: {{ default "/mkdocs-vars" .Values.macroPlugin.extraYamlConfigMount }}
+  {{- if and .Values.macrosPlugin.enabled .Values.macrosPlugin.extraYamlConfig }}
+    - mountPath: {{ default "/mkdocs-vars" .Values.macrosPlugin.extraYamlConfigMount }}
       name: {{ include "mkdocs-material.fullname" . }}-macro-vars
   {{- end }}
   {{- if .Values.giturl }}
@@ -208,7 +208,7 @@ Subpath prefix value to use for pvc mount points
   configMap:
     name: {{ include "mkdocs-material.fullname" . }}-cacerts
 {{- end }}
-{{- if and .Values.macroPlugin.enabled .Values.macroPlugin.extraYamlConfig }}
+{{- if and .Values.macrosPlugin.enabled .Values.macrosPlugin.extraYamlConfig }}
 - name: {{ include "mkdocs-material.fullname" . }}-macro-vars
   configMap:
     name: {{ include "mkdocs-material.fullname" . }}-macro-vars

charts/mkdocs-material/templates/configmap-macro-vars.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.macroPlugin.enabled .Values.macroPlugin.extraYamlConfig }}
+{{- if and .Values.macrosPlugin.enabled .Values.macrosPlugin.extraYamlConfig }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,7 +7,7 @@ metadata:
     {{- include "mkdocs-material.labels" . | nindent 4 }}
 
 data:
-{{- range .Values.macroPlugin.extraYamlConfig }}
+{{- range .Values.macrosPlugin.extraYamlConfig }}
 {{- $configContent := toYaml .values }}
   {{ .path }}: |-
     {{- (tpl $configContent $) | nindent 4}}

charts/mkdocs-material/values.yaml

@@ -94,7 +94,7 @@ affinity: {}
 # Option to add the mkdocs-macros-plugin                     #
 # See https://mkdocs-macros-plugin.readthedocs.io/en/latest/ #
 ##############################################################
-macroPlugin:
+macrosPlugin:
   enabled: false
   version: 1.3.9       # pip version of mkdocs-macros-plugin
   extraYamlConfigMount: /mkdocs-vars # The name of the volume mount path for extra yaml config files