From cc87bbecb706ce0ec71471e8b220ecf8bd33f2e6 Mon Sep 17 00:00:00 2001
From: Ashish Jaiswal <ashish@obmondo.com>
Date: Thu, 15 Aug 2024 13:54:47 +0530
Subject: [PATCH] fixed the puppetserver helm chart bug when mounting eyaml

---
 .../templates/puppetserver-deployment-masters.yaml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/argocd-helm-charts/puppetserver/charts/puppetserver/templates/puppetserver-deployment-masters.yaml b/argocd-helm-charts/puppetserver/charts/puppetserver/templates/puppetserver-deployment-masters.yaml
index 94d13edf5..03229b1c3 100644
--- a/argocd-helm-charts/puppetserver/charts/puppetserver/templates/puppetserver-deployment-masters.yaml
+++ b/argocd-helm-charts/puppetserver/charts/puppetserver/templates/puppetserver-deployment-masters.yaml
@@ -278,7 +278,7 @@ spec:
             httpGet:
               path: /status/v1/simple
               port: {{ template "puppetserver.puppetserver-masters.port" .}}
-              scheme: {{ .Values.puppetserver.masters.readinessProbeScheme }} 
+              scheme: {{ .Values.puppetserver.masters.readinessProbeScheme }}
             periodSeconds: {{ .Values.puppetserver.masters.readinessProbePeriodSeconds }}
             timeoutSeconds: {{ .Values.puppetserver.masters.readinessProbeTimeout }}
             failureThreshold: {{ .Values.puppetserver.masters.readinessProbeFailureThreshold }}
@@ -332,12 +332,12 @@ spec:
             - name: hiera-volume
               mountPath: /etc/puppetlabs/puppet/hiera.yaml
               subPath: hiera.yaml
+            {{- end }}
             {{- if and (or (.Values.hiera.eyaml.existingMap) (.Values.hiera.eyaml.existingSecret)) (not .Values.hiera.eyaml.public_key) (not .Values.hiera.eyaml.private_key)  }}
             - name: eyaml-volume
               mountPath: /etc/puppetlabs/puppet/eyaml/keys
             {{- end }}
             {{- end }}
-            {{- end }}
           securityContext:
             {{- if .Values.global.runAsNonRoot }}
             runAsUser: {{ .Values.global.securityContext.runAsUser }}