From b5c285ae98064e9bb6738f66daf5d52cb244944f Mon Sep 17 00:00:00 2001
From: Graham Steffaniak <v-grahams@microsoft.com>
Date: Mon, 28 Mar 2022 14:18:34 -0500
Subject: [PATCH] Revert chart naming to .Release.Name expression

	CHG required for existing deployments to be
	 upgraded in place.

Change-Id: Ife4278f17601358dcd853c29977f5e2e88e521dc
---
 helm-toolkit/Chart.yaml                              |  2 +-
 .../snippets/_kubernetes_apparmor_configmap.tpl      |  2 +-
 .../snippets/_kubernetes_apparmor_volumes.tpl        |  2 +-
 .../snippets/_kubernetes_metadata_labels.tpl         |  2 +-
 .../snippets/_kubernetes_pod_anti_affinity.tpl       |  2 +-
 .../snippets/_kubernetes_pod_rbac_roles.tpl          |  2 +-
 .../templates/snippets/_values_template_renderer.tpl |  2 +-
 .../templates/utils/_to_k8s_env_secret_vars.tpl      |  2 +-
 mariadb/Chart.yaml                                   |  2 +-
 mariadb/templates/deployment-ingress.yaml            |  8 ++++----
 mariadb/templates/pod-test.yaml                      |  4 ++--
 mariadb/templates/statefulset.yaml                   |  6 +++---
 memcached/Chart.yaml                                 |  2 +-
 memcached/templates/configmap-bin.yaml               |  2 +-
 memcached/templates/deployment.yaml                  |  4 ++--
 rabbitmq/Chart.yaml                                  |  2 +-
 rabbitmq/templates/configmap-bin.yaml                |  2 +-
 rabbitmq/templates/configmap-etc.yaml                |  2 +-
 rabbitmq/templates/ingress-management.yaml           |  2 +-
 rabbitmq/templates/job-cluster-wait.yaml             |  8 ++++----
 .../monitoring/prometheus/exporter-deployment.yaml   |  6 +++---
 rabbitmq/templates/pod-test.yaml                     |  8 ++++----
 rabbitmq/templates/secret-erlang-cookie.yaml         |  2 +-
 rabbitmq/templates/secret-rabbit-admin.yaml          |  2 +-
 rabbitmq/templates/service-ingress-management.yaml   |  2 +-
 rabbitmq/templates/statefulset.yaml                  | 12 ++++++------
 releasenotes/notes/helm-toolkit.yaml                 |  1 +
 releasenotes/notes/mariadb.yaml                      |  1 +
 releasenotes/notes/memcached.yaml                    |  1 +
 releasenotes/notes/rabbitmq.yaml                     |  1 +
 30 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index a41c11e65..6c71208e9 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.39
+version: 0.2.40
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/snippets/_kubernetes_apparmor_configmap.tpl b/helm-toolkit/templates/snippets/_kubernetes_apparmor_configmap.tpl
index aa656c132..8ca102806 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_apparmor_configmap.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_apparmor_configmap.tpl
@@ -49,7 +49,7 @@ data:
 {{- if eq $envAll.Values.pod.mandatory_access_control.type "apparmor" -}}
 {{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
 {{- if $envAll.Values.pod.mandatory_access_control.configmap_apparmor }}
-{{- $mapName := printf "%s-%s-%s" $envAll.Chart.Name $component "apparmor" -}}
+{{- $mapName := printf "%s-%s-%s" $envAll.Release.Name $component "apparmor" -}}
 {{- if $envAll.Values.conf.apparmor_profiles }}
 ---
 apiVersion: v1
diff --git a/helm-toolkit/templates/snippets/_kubernetes_apparmor_volumes.tpl b/helm-toolkit/templates/snippets/_kubernetes_apparmor_volumes.tpl
index c5e07ee32..baebaa3cb 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_apparmor_volumes.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_apparmor_volumes.tpl
@@ -42,7 +42,7 @@ return: |
 {{- $envAll := index . "envAll" -}}
 {{- $component := index . "component" -}}
 {{- $requireSys := index . "requireSys" | default false -}}
-{{- $configName := printf "%s-%s-%s" $envAll.Chart.Name $component "apparmor" -}}
+{{- $configName := printf "%s-%s-%s" $envAll.Release.Name $component "apparmor" -}}
 {{- if hasKey $envAll.Values.pod "mandatory_access_control" -}}
 {{- if hasKey $envAll.Values.pod.mandatory_access_control "type" -}}
 {{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
diff --git a/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl b/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
index b8493b35f..48b53fa10 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
@@ -37,7 +37,7 @@ return: |
 {{- $envAll := index . 0 -}}
 {{- $application := index . 1 -}}
 {{- $component := index . 2 -}}
-release_group: {{ $envAll.Values.release_group | default $envAll.Chart.Name }}
+release_group: {{ $envAll.Values.release_group | default $envAll.Release.Name }}
 application: {{ $application }}
 component: {{ $component }}
 {{- if ($envAll.Values.pod).labels }}
diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
index f1ad58092..fabbcf8d9 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
@@ -53,7 +53,7 @@ return: |
 {{- $envAll := index . "envAll" -}}
 {{- $application := index . "application" -}}
 {{- $component := index . "component" -}}
-{{- $expressionRelease := dict "key" "release_group" "operator" "In"  "values" ( list ( $envAll.Values.release_group | default $envAll.Chart.Name ) ) -}}
+{{- $expressionRelease := dict "key" "release_group" "operator" "In"  "values" ( list ( $envAll.Values.release_group | default $envAll.Release.Name ) ) -}}
 {{- $expressionApplication := dict "key" "application" "operator" "In"  "values" ( list $application ) -}}
 {{- $expressionComponent := dict "key" "component" "operator" "In"  "values" ( list $component ) -}}
 {{- list $expressionRelease $expressionApplication $expressionComponent | toYaml }}
diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl
index c2576d5bb..90a7a6517 100644
--- a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl
+++ b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl
@@ -17,7 +17,7 @@ limitations under the License.
 {{- $deps := index . 1 -}}
 {{- $saName := index . 2 | replace "_" "-" }}
 {{- $saNamespace := index . 3 -}}
-{{- $releaseName := $envAll.Chart.Name }}
+{{- $releaseName := $envAll.Release.Name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
diff --git a/helm-toolkit/templates/snippets/_values_template_renderer.tpl b/helm-toolkit/templates/snippets/_values_template_renderer.tpl
index 7fa180a17..6e9d5a184 100644
--- a/helm-toolkit/templates/snippets/_values_template_renderer.tpl
+++ b/helm-toolkit/templates/snippets/_values_template_renderer.tpl
@@ -28,7 +28,7 @@ values: |
         {{ include "helm-toolkit.utils.joinListWithComma" .Values.conf.inputs }}
       config_to_complete:
         #here we can fill out params, but things need to be valid yaml as input
-        '{{ .Chart.Name }}': '{{ printf "%s-%s" .Release.Namespace "namespace" }}'
+        '{{ .Release.Name }}': '{{ printf "%s-%s" .Release.Namespace "namespace" }}'
       static_config:
         #this is just passed though as yaml to the configmap
         foo: bar
diff --git a/helm-toolkit/templates/utils/_to_k8s_env_secret_vars.tpl b/helm-toolkit/templates/utils/_to_k8s_env_secret_vars.tpl
index d66663ff4..885a86cc7 100644
--- a/helm-toolkit/templates/utils/_to_k8s_env_secret_vars.tpl
+++ b/helm-toolkit/templates/utils/_to_k8s_env_secret_vars.tpl
@@ -40,7 +40,7 @@ return: |
 - name: {{ $key }}
   valueFrom:
     secretKeyRef:
-      name: {{ printf "%s-%s" $context.Chart.Name "env-secret" | quote }}
+      name: {{ printf "%s-%s" $context.Release.Name "env-secret" | quote }}
       key: {{ $key }}
 {{ end -}}
 {{- end -}}
diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index 02b5e3365..05d505d82 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.15
+version: 0.2.16
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml
index 2648e8905..add8501c2 100644
--- a/mariadb/templates/deployment-ingress.yaml
+++ b/mariadb/templates/deployment-ingress.yaml
@@ -15,9 +15,9 @@ limitations under the License.
 {{- if .Values.manifests.deployment_ingress }}
 {{- $envAll := . }}
 
-{{- $ingressClass := printf "%s-%s" .Chart.Name "mariadb-ingress" }}
+{{- $ingressClass := printf "%s-%s" .Release.Name "mariadb-ingress" }}
 
-{{- $serviceAccountName := printf "%s-%s" .Chart.Name "ingress" }}
+{{- $serviceAccountName := printf "%s-%s" .Release.Name "ingress" }}
 {{ tuple $envAll "ingress" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -156,7 +156,7 @@ rules:
   - apiGroups:
       - ""
     resourceNames:
-      - {{ printf "%s-%s" .Chart.Name $ingressClass | quote }}
+      - {{ printf "%s-%s" .Release.Name $ingressClass | quote }}
     resources:
       - configmaps
     verbs:
@@ -264,7 +264,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: RELEASE_NAME
-              value: {{ .Chart.Name | quote }}
+              value: {{ .Release.Name | quote }}
             - name: INGRESS_CLASS
               value: {{ $ingressClass | quote }}
             - name: ERROR_PAGE_SERVICE
diff --git a/mariadb/templates/pod-test.yaml b/mariadb/templates/pod-test.yaml
index fe977c791..940430a92 100644
--- a/mariadb/templates/pod-test.yaml
+++ b/mariadb/templates/pod-test.yaml
@@ -16,13 +16,13 @@ limitations under the License.
 {{- $envAll := . }}
 {{- $dependencies := .Values.dependencies.static.tests }}
 
-{{- $serviceAccountName := print .Chart.Name "-test" }}
+{{- $serviceAccountName := print .Release.Name "-test" }}
 {{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Chart.Name}}-test"
+  name: "{{.Release.Name}}-test"
   labels:
 {{ tuple $envAll "mariadb" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index 72dcd4a77..d2d1c2e36 100644
--- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml
@@ -22,7 +22,7 @@ exec:
 {{- if .Values.manifests.statefulset }}
 {{- $envAll := . }}
 
-{{- $serviceAccountName := printf "%s-%s" .Chart.Name "mariadb" }}
+{{- $serviceAccountName := printf "%s-%s" .Release.Name "mariadb" }}
 {{ tuple $envAll "mariadb" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -40,7 +40,7 @@ rules:
   - apiGroups:
       - ""
     resourceNames:
-      - {{ printf "%s-%s" .Chart.Name "mariadb-state" | quote }}
+      - {{ printf "%s-%s" .Release.Name "mariadb-state" | quote }}
     resources:
       - configmaps
     verbs:
@@ -151,7 +151,7 @@ spec:
             - name: WSREP_PORT
               value: {{ tuple "oslo_db" "direct" "wsrep" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
             - name: STATE_CONFIGMAP
-              value: {{ printf "%s-%s" .Chart.Name "mariadb-state" | quote }}
+              value: {{ printf "%s-%s" .Release.Name "mariadb-state" | quote }}
             - name: MYSQL_DBADMIN_USERNAME
               value: {{ .Values.endpoints.oslo_db.auth.admin.username }}
             - name: MYSQL_DBADMIN_PASSWORD
diff --git a/memcached/Chart.yaml b/memcached/Chart.yaml
index 2ec6d9515..8cc30129e 100644
--- a/memcached/Chart.yaml
+++ b/memcached/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.5.5
 description: OpenStack-Helm Memcached
 name: memcached
-version: 0.1.8
+version: 0.1.9
 home: https://github.com/memcached/memcached
 ...
diff --git a/memcached/templates/configmap-bin.yaml b/memcached/templates/configmap-bin.yaml
index a58e6eff8..2fc4e2b2b 100644
--- a/memcached/templates/configmap-bin.yaml
+++ b/memcached/templates/configmap-bin.yaml
@@ -14,7 +14,7 @@ limitations under the License.
 
 {{- if .Values.manifests.configmap_bin }}
 {{- $envAll := . }}
-{{- $configMapBinName := printf "%s-%s" $envAll.Chart.Name "memcached-bin"  }}
+{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin"  }}
 ---
 apiVersion: v1
 kind: ConfigMap
diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml
index 1ab132564..0aa5f8eec 100644
--- a/memcached/templates/deployment.yaml
+++ b/memcached/templates/deployment.yaml
@@ -15,8 +15,8 @@ limitations under the License.
 {{- if .Values.manifests.deployment }}
 {{- $envAll := . }}
 
-{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "memcached" }}
-{{- $configMapBinName := printf "%s-%s" $envAll.Chart.Name "memcached-bin" }}
+{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "memcached" }}
+{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }}
 
 {{ tuple $envAll "memcached" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index de6e1ef6c..25a062fe0 100644
--- a/rabbitmq/Chart.yaml
+++ b/rabbitmq/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v3.7.26
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 0.1.17
+version: 0.1.18
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/templates/configmap-bin.yaml b/rabbitmq/templates/configmap-bin.yaml
index 14b4ac3bd..85b26a064 100644
--- a/rabbitmq/templates/configmap-bin.yaml
+++ b/rabbitmq/templates/configmap-bin.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-%s" .Chart.Name "rabbitmq-bin" | quote }}
+  name: {{ printf "%s-%s" .Release.Name "rabbitmq-bin" | quote }}
 data:
 {{- if .Values.images.local_registry.active }}
   image-repo-sync.sh: |
diff --git a/rabbitmq/templates/configmap-etc.yaml b/rabbitmq/templates/configmap-etc.yaml
index e5b1fc308..b9ee9564e 100644
--- a/rabbitmq/templates/configmap-etc.yaml
+++ b/rabbitmq/templates/configmap-etc.yaml
@@ -49,7 +49,7 @@ limitations under the License.
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-etc" | quote }}
+  name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-etc" | quote }}
 data:
   enabled_plugins: |
 {{ tuple "etc/_enabled_plugins.tpl" . | include  "helm-toolkit.utils.template" | indent 4 }}
diff --git a/rabbitmq/templates/ingress-management.yaml b/rabbitmq/templates/ingress-management.yaml
index d06c3c68e..32b2eb8fd 100644
--- a/rabbitmq/templates/ingress-management.yaml
+++ b/rabbitmq/templates/ingress-management.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if and .Values.manifests.ingress_management .Values.network.management.ingress.public }}
 {{- $envAll := . }}
 {{- if empty $envAll.Values.endpoints.oslo_messaging.hosts.public }}
-{{- $service_public_name := .Chart.Name | trunc 12 }}
+{{- $service_public_name := .Release.Name | trunc 12 }}
 {{- $_ := set $envAll.Values.endpoints.oslo_messaging.hosts "public" ( printf "%s-%s-%s" $service_public_name "mgr" ( $service_public_name | sha256sum | trunc 6 )) }}
 {{- end }}
 {{- $ingressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}
diff --git a/rabbitmq/templates/job-cluster-wait.yaml b/rabbitmq/templates/job-cluster-wait.yaml
index 6beb6e42a..b309e6e5f 100644
--- a/rabbitmq/templates/job-cluster-wait.yaml
+++ b/rabbitmq/templates/job-cluster-wait.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if .Values.manifests.job_cluster_wait }}
 {{- $envAll := . }}
 
-{{- $serviceAccountName := print .Chart.Name "-cluster-wait" }}
+{{- $serviceAccountName := print .Release.Name "-cluster-wait" }}
 {{ tuple $envAll "cluster_wait" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 
 {{- $protocol := "http" }}
@@ -26,7 +26,7 @@ limitations under the License.
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: "{{.Chart.Name}}-cluster-wait"
+  name: "{{.Release.Name}}-cluster-wait"
   labels:
 {{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
@@ -100,11 +100,11 @@ spec:
           emptyDir: {}
         - name: rabbitmq-bin
           configMap:
-            name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
+            name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
             defaultMode: 0555
         - name: rabbitmq-erlang-cookie
           secret:
-            secretName: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
+            secretName: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
             defaultMode: 0444
 {{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
 {{- end }}
diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
index 272bb4cbb..7d8557145 100644
--- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
+++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
@@ -22,7 +22,7 @@ httpGet:
 {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
 {{- $envAll := . }}
 
-{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "rabbitmq-exporter"  }}
+{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq-exporter"  }}
 {{ tuple $envAll "prometheus_rabbitmq_exporter" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 
 {{- $protocol := "http" }}
@@ -77,12 +77,12 @@ spec:
           - name: RABBIT_USER
             valueFrom:
               secretKeyRef:
-                name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
+                name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
                 key: RABBITMQ_ADMIN_USERNAME
           - name: RABBIT_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
+                name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
                 key: RABBITMQ_ADMIN_PASSWORD
           - name: RABBIT_CAPABILITIES
             value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}
diff --git a/rabbitmq/templates/pod-test.yaml b/rabbitmq/templates/pod-test.yaml
index 8af53dcaf..2ee00d5d8 100644
--- a/rabbitmq/templates/pod-test.yaml
+++ b/rabbitmq/templates/pod-test.yaml
@@ -17,11 +17,11 @@ limitations under the License.
 
 {{ if kindIs "string" $envAll.Values.dependencies.static.tests.jobs }}
 {{ if eq $envAll.Values.dependencies.static.tests.jobs "cluster_wait" }}
-{{ $_ := set $envAll.Values.dependencies.static.tests "jobs" ( list ( print $envAll.Chart.Name "-cluster-wait" ) ) }}
+{{ $_ := set $envAll.Values.dependencies.static.tests "jobs" ( list ( print $envAll.Release.Name "-cluster-wait" ) ) }}
 {{ end }}
 {{ end }}
 
-{{- $serviceAccountName := print .Chart.Name "-test" }}
+{{- $serviceAccountName := print .Release.Name "-test" }}
 {{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 
 {{- $protocol := "http" }}
@@ -32,7 +32,7 @@ limitations under the License.
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{.Chart.Name}}-test"
+  name: "{{.Release.Name}}-test"
   labels:
 {{ tuple $envAll "rabbitmq" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
@@ -71,7 +71,7 @@ spec:
       emptyDir: {}
     - name: rabbitmq-bin
       configMap:
-        name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
+        name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
         defaultMode: 0555
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
 {{- end }}
diff --git a/rabbitmq/templates/secret-erlang-cookie.yaml b/rabbitmq/templates/secret-erlang-cookie.yaml
index e2f44909e..9d585df36 100644
--- a/rabbitmq/templates/secret-erlang-cookie.yaml
+++ b/rabbitmq/templates/secret-erlang-cookie.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
+  name: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
 type: Opaque
 data:
   erlang_cookie: {{ $envAll.Values.endpoints.oslo_messaging.auth.erlang_cookie | b64enc -}}
diff --git a/rabbitmq/templates/secret-rabbit-admin.yaml b/rabbitmq/templates/secret-rabbit-admin.yaml
index 50abcf2ae..dc3cdaace 100644
--- a/rabbitmq/templates/secret-rabbit-admin.yaml
+++ b/rabbitmq/templates/secret-rabbit-admin.yaml
@@ -18,7 +18,7 @@ limitations under the License.
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
+  name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
 type: Opaque
 data:
   RABBITMQ_ADMIN_USERNAME: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.username | b64enc }}
diff --git a/rabbitmq/templates/service-ingress-management.yaml b/rabbitmq/templates/service-ingress-management.yaml
index cf14561be..fcbb96103 100644
--- a/rabbitmq/templates/service-ingress-management.yaml
+++ b/rabbitmq/templates/service-ingress-management.yaml
@@ -15,7 +15,7 @@ limitations under the License.
 {{- if and .Values.manifests.service_ingress_management .Values.network.management.ingress.public }}
 {{- $envAll := . }}
 {{- if empty $envAll.Values.endpoints.oslo_messaging.hosts.public }}
-{{- $service_public_name := .Chart.Name | trunc 12 }}
+{{- $service_public_name := .Release.Name | trunc 12 }}
 {{- $_ := set $envAll.Values.endpoints.oslo_messaging.hosts "public" ( printf "%s-%s-%s" $service_public_name "mgr" ( $service_public_name | sha256sum | trunc 6 )) }}
 {{- end }}
 {{- $serviceIngressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 8a1361391..578ea3579 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -32,7 +32,7 @@ limitations under the License.
 {{- if .Values.manifests.statefulset }}
 {{- $envAll := . }}
 
-{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "rabbitmq" }}
+{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq" }}
 {{ tuple $envAll "rabbitmq" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 
 {{- $protocol := "http" }}
@@ -117,12 +117,12 @@ spec:
             - name: RABBITMQ_ADMIN_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
+                  name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
                   key: RABBITMQ_ADMIN_USERNAME
             - name: RABBITMQ_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
+                  name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
                   key: RABBITMQ_ADMIN_PASSWORD
             - name: RABBITMQ_DEFINITION_FILE
               value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
@@ -275,15 +275,15 @@ spec:
           emptyDir: {}
         - name: rabbitmq-bin
           configMap:
-            name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
+            name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
             defaultMode: 0555
         - name: rabbitmq-etc
           configMap:
-            name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-etc" | quote }}
+            name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-etc" | quote }}
             defaultMode: 0444
         - name: rabbitmq-erlang-cookie
           secret:
-            secretName: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
+            secretName: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
             defaultMode: 0444
 {{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
         {{- if not $envAll.Values.volume.enabled }}
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index 78519dc1b..e38016fe1 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -46,4 +46,5 @@ helm-toolkit:
   - 0.2.37 Updated chart naming for subchart compatibility
   - 0.2.38 Minor change to display archive directory with files in sub-directory
   - 0.2.39 Removed tillerVersion from Chart to pass helm3 linting
+  - 0.2.40 Revert chart naming for subchart compatibility
 ...
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index 7cee6b8da..a49c41338 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -31,4 +31,5 @@ mariadb:
   - 0.2.13 Adjust readiness.sh in single node and no replication case
   - 0.2.14 Fix comparison value
   - 0.2.15 Updated naming for subchart compatibility
+  - 0.2.16 Revert naming for subchart compatibility
 ...
diff --git a/releasenotes/notes/memcached.yaml b/releasenotes/notes/memcached.yaml
index 869e28351..820cdb3a8 100644
--- a/releasenotes/notes/memcached.yaml
+++ b/releasenotes/notes/memcached.yaml
@@ -9,4 +9,5 @@ memcached:
   - 0.1.6 Switch to using sidecar for exporter
   - 0.1.7 Updated naming for subchart compatibility
   - 0.1.8 Enable taint toleration for Openstack services jobs
+  - 0.1.9 Revert naming for subchart compatibility
 ...
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index 72e9c4128..eee98c466 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -17,4 +17,5 @@ rabbitmq:
   - 0.1.15 Update htk requirements
   - 0.1.16 Add force_boot command to rabbit start template
   - 0.1.17 Updated naming for subchart compatibility
+  - 0.1.18 Revert naming for subchart compatibility
 ...