From 38775079fbc59d71b94ff0ffd2efbf5cb9d452ea Mon Sep 17 00:00:00 2001
From: "KHIYANI, RAHUL (rk0850)" <rk0850@att.com>
Date: Wed, 3 Jun 2020 11:04:21 -0500
Subject: [PATCH] mariadb: change container name to static

Change-Id: I2f7939015cced812cd7e49ad35c60d8384f13c1f
---
 mariadb/templates/pod-test.yaml        | 4 ++--
 mariadb/values_overrides/apparmor.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mariadb/templates/pod-test.yaml b/mariadb/templates/pod-test.yaml
index 38cd592666..20ece6e27c 100644
--- a/mariadb/templates/pod-test.yaml
+++ b/mariadb/templates/pod-test.yaml
@@ -28,7 +28,7 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
-{{ dict "envAll" $envAll "podName" "mariadb-test" "containerNames" (list "init" "mariadb-mariadb-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
+{{ dict "envAll" $envAll "podName" "mariadb-test" "containerNames" (list "init" "mariadb-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
 spec:
   shareProcessNamespace: true
   serviceAccountName: {{ $serviceAccountName }}
@@ -39,7 +39,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
   containers:
-    - name: {{.Release.Name}}-mariadb-test
+    - name: mariadb-test
 {{ dict "envAll" $envAll "application" "tests" "container" "test" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 6 }}
 {{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
       command:
diff --git a/mariadb/values_overrides/apparmor.yaml b/mariadb/values_overrides/apparmor.yaml
index 5fed2dcc58..f2f16c6cf0 100644
--- a/mariadb/values_overrides/apparmor.yaml
+++ b/mariadb/values_overrides/apparmor.yaml
@@ -17,7 +17,7 @@ pod:
       mariadb-backup: runtime/default
     mariadb-test:
       init: runtime/default
-      mariadb-mariadb-test: runtime/default
+      mariadb-test: runtime/default
     prometheus-mysql-exporter:
       init: runtime/default
       mysql-exporter: runtime/default