From 0b4d19b887f398e60cf805afb5ad2ed0b0c5fc43 Mon Sep 17 00:00:00 2001
From: chriswldenyer <christopher.denyer@mayadata.io>
Date: Thu, 16 May 2024 10:25:16 +0100
Subject: [PATCH] chore: mod path of image pull secret

Signed-off-by: chriswldenyer <christopher.denyer@mayadata.io>
---
 chart/README.md              |  3 ++-
 chart/templates/_helpers.tpl | 10 ++++++++--
 chart/values.yaml            | 15 ++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/chart/README.md b/chart/README.md
index 8750a60df..19ebf1079 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -102,7 +102,6 @@ This removes all the Kubernetes components associated with the chart and deletes
 | apis.&ZeroWidthSpace;rest.&ZeroWidthSpace;tolerations | Set tolerations, overrides global | `[]` |
 | base.&ZeroWidthSpace;cache_poll_period | Cache timeout for core agent & diskpool deployment | `"30s"` |
 | base.&ZeroWidthSpace;default_req_timeout | Request timeout for rest & core agents | `"5s"` |
-| base.&ZeroWidthSpace;imagePullSecrets.&ZeroWidthSpace;enabled | Enable imagePullSecrets for pulling our container images | `false` |
 | base.&ZeroWidthSpace;logging.&ZeroWidthSpace;color | Enable ansi color code for Pod StdOut/StdErr | `true` |
 | base.&ZeroWidthSpace;logging.&ZeroWidthSpace;format | Valid values for format are pretty, json and compact | `"pretty"` |
 | base.&ZeroWidthSpace;logging.&ZeroWidthSpace;silenceLevel | Silence specific module components | `nil` |
@@ -149,6 +148,8 @@ This removes all the Kubernetes components associated with the chart and deletes
 | etcd.&ZeroWidthSpace;removeMemberOnContainerTermination | Use a PreStop hook to remove the etcd members from the etcd cluster on container termination Ignored if lifecycleHooks is set or replicaCount=1 | `false` |
 | etcd.&ZeroWidthSpace;replicaCount | Number of replicas of etcd | `3` |
 | image.&ZeroWidthSpace;pullPolicy | ImagePullPolicy for our images | `"Always"` |
+| image.&ZeroWidthSpace;pullSecrets.&ZeroWidthSpace;enabled | Enable pullSecrets for pulling our container images | `false` |
+| image.&ZeroWidthSpace;pullSecrets.&ZeroWidthSpace;secrets | Name of the pullSecret in the installed namespace | `[{"name":"login"}]` |
 | image.&ZeroWidthSpace;registry | Image registry to pull our product images | `"docker.io"` |
 | image.&ZeroWidthSpace;repo | Image registry's namespace | `"openebs"` |
 | image.&ZeroWidthSpace;tag | Release tag for our images | `"develop"` |
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index 495538e2d..fa992f4d4 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -77,8 +77,14 @@ Usage:
 {{ include "base_pull_secrets" . }}
 */}}
 {{- define "base_pull_secrets" -}}
-    {{- if .Values.base.imagePullSecrets.enabled }}
-    {{- include "render" (dict "value" .Values.base.imagePullSecrets.secrets "context" $) | nindent 8 }}
+    {{- if .Values.base.imagePullSecrets }}
+        {{- if .Values.base.imagePullSecrets.enabled }}
+        {{- include "render" (dict "value" .Values.base.imagePullSecrets.secrets "context" $) | nindent 8 }}
+        {{- end }}
+    {{- else -}}
+        {{- if (.Values.image.pullSecrets).enabled }}
+        {{- include "render" (dict "value" .Values.image.pullSecrets.secrets "context" $) | nindent 8 }}
+        {{- end }}
     {{- end }}
 {{- end -}}
 
diff --git a/chart/values.yaml b/chart/values.yaml
index dd3e8dfcd..481dcafe1 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -26,6 +26,14 @@ image:
   # -- ImagePullPolicy for our images
   pullPolicy: Always
 
+  # docker-secrets required to pull images if the container registry from image.Registry is protected
+  pullSecrets:
+    # -- Enable pullSecrets for pulling our container images
+    enabled: false
+    # -- Name of the pullSecret in the installed namespace
+    secrets:
+      - name: login
+
 # -- Node labels for pod assignment
 # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
 # Note that if multi-arch images support 'kubernetes.io/arch: amd64'
@@ -87,13 +95,6 @@ base:
       - name: etcd-probe
         image: busybox:latest
         command: ['sh', '-c', 'trap "exit 1" TERM; until nc -vzw 5 {{ .Release.Name }}-etcd {{.Values.etcd.service.port}}; do date; echo "Waiting for etcd..."; sleep 1; done;']
-  # docker-secrets required to pull images if the container registry from image.Registry is protected
-  imagePullSecrets:
-    # -- Enable imagePullSecrets for pulling our container images
-    enabled: false
-    # Name of the imagePullSecret in the installed namespace
-    secrets:
-      - name: login
 
   metrics:
     # -- Enable the metrics exporter