From 00dfee338c1006071fb5feca1d2b6d6cec086d1b Mon Sep 17 00:00:00 2001
From: Olu Shiyanbade <olushiyanbade@Olus-MacBook-Pro.local>
Date: Tue, 31 Jan 2023 11:04:24 +0000
Subject: [PATCH] externalise config map name

---
 nxrm-aws-resiliency/templates/workdir-configmap.yaml | 2 +-
 nxrm-aws-resiliency/templates/workdir-daemonset.yaml | 4 ++--
 nxrm-aws-resiliency/values.yaml                      | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nxrm-aws-resiliency/templates/workdir-configmap.yaml b/nxrm-aws-resiliency/templates/workdir-configmap.yaml
index 72d54be..1048e82 100644
--- a/nxrm-aws-resiliency/templates/workdir-configmap.yaml
+++ b/nxrm-aws-resiliency/templates/workdir-configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Chart.Name }}-{{ .Chart.Version }}-{{ .Release.Name }}-create-nexus-workdir-config | trunc 63 | trimSuffix "-"
+  name: {{ .Values.workdir.configmap.name }}
   namespace: {{ .Values.namespaces.nexusNs }}
 data:
    create-nexus-work-dir.sh: |
diff --git a/nxrm-aws-resiliency/templates/workdir-daemonset.yaml b/nxrm-aws-resiliency/templates/workdir-daemonset.yaml
index 5260789..b03a4a8 100644
--- a/nxrm-aws-resiliency/templates/workdir-daemonset.yaml
+++ b/nxrm-aws-resiliency/templates/workdir-daemonset.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name:  {{ .Chart.Name }}-{{ .Chart.Version }}-{{ .Release.Name }}-create-nexus-work-dir | trunc 63 | trimSuffix "-"
+  name:  {{ .Values.workdir.daemonset.name }}
   namespace: {{ .Values.namespaces.nexusNs }}
 spec:
   selector:
@@ -45,7 +45,7 @@ spec:
       volumes:
       - name: create-nexus-work-dir-script
         configMap:
-          name: {{ .Chart.Name }}-{{ .Chart.Version }}-{{ .Release.Name }}-create-nexus-workdir-config | trunc 63 | trimSuffix "-"
+          name: {{ .Values.workdir.configmap.name }}
       - name: host-mnt
         hostPath:
           path: /tmp/install
diff --git a/nxrm-aws-resiliency/values.yaml b/nxrm-aws-resiliency/values.yaml
index c82349f..89a553e 100644
--- a/nxrm-aws-resiliency/values.yaml
+++ b/nxrm-aws-resiliency/values.yaml
@@ -62,6 +62,11 @@ ingress:
 #      alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' #uncomment if you use docker repositories
 #      alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:0000000000000:certificate/00000000-1111-2222-3333-444444444444  #  Uncomment if you use docker repositories - The AWS Certificate Manager ARN for your HTTPS certificate
 #      external-dns.alpha.kubernetes.io/hostname: dockerrepo1.example.com, dockerrepo2.example.com, dockerrepo3.example.com # Add more docker subdomains using dockerrepoName.example.com othereise comment out if you don't use docker repositories
+workdir:
+  configmap:
+    name: create-nexus-workdir-config
+  daemonset:
+    name: create-nexus-work-dir
 storageClass:
   iopsPerGB: "10" #Note: aws plugin multiplies this by the size of the requested volumne to compute IOPS of the volumne and caps it a 20, 000 IOPS
 pv: