Merge "[COMMON] Make our common charts compatible with helm 3.7+"

diff --combined kubernetes/common/certInitializer/templates/_certInitializer.yaml
index d5fc5a0,ecd7129..b1e85c0
--- 1/kubernetes/common/certInitializer/templates/_certInitializer.yaml
--- 2/kubernetes/common/certInitializer/templates/_certInitializer.yaml
+++ b/kubernetes/common/certInitializer/templates/_certInitializer.yaml
@@@ -84,19 -84,12 +84,19 @@@
    env:
      - name: APP_FQI
        value: "{{ $initRoot.fqi }}"
 +  {{- if $initRoot.aaf_namespace }}
      - name: aaf_locate_url
 -      value: "https://aaf-locate.{{ $dot.Release.Namespace}}:8095"
 -    - name: aaf_locator_container
 -      value: "oom"
 +      value: "https://aaf-locate.{{ $initRoot.aaf_namespace }}:8095"
 +    - name: aaf_locator_container_ns
 +      value: "{{ $initRoot.aaf_namespace }}"
 +  {{- else }}
 +    - name: aaf_locate_url
 +      value: "https://aaf-locate.{{ $dot.Release.Namespace }}:8095"
      - name: aaf_locator_container_ns
        value: "{{ $dot.Release.Namespace }}"
 +  {{- end }}
 +    - name: aaf_locator_container
 +      value: "oom"
      - name: aaf_locator_fqdn
        value: "{{ $initRoot.fqdn }}"
      - name: aaf_locator_app_ns
@@@ -190,7 -183,7 +190,7 @@@
  {{- define "common.certInitializer._volumes" -}}
  {{-   $dot := default . .dot -}}
  {{-   $initRoot := default $dot.Values.certInitializer .initRoot -}}
- {{- $subchartDot := mergeOverwrite (deepCopy (omit $dot "Values")) (dict "Chart" (set (fromJson (toJson $dot.Chart)) "Name" $initRoot.nameOverride) "Values" (mergeOverwrite (deepCopy $initRoot) (dict "global" $dot.Values.global))) }}
+ {{- $subchartDot := fromJson (include "common.subChartDot" (dict "dot" $dot "initRoot" $initRoot))}}
  - name: {{ include "common.certInitializer._aafConfigVolumeName" $dot }}
    emptyDir:
      medium: Memory