Merge pull request 'fixed the puppetserver helm chart bug when mounti…

…ng eyaml' (#346) from linuxaid_setup into master Reviewed-on: https://gitea.obmondo.com/EnableIT/KubeAid/pulls/346
Obmondo · Aug 15, 2024 · d010048 · d010048
2 parents 87bf986 + cc87bbe
commit d010048
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...lm-charts/puppetserver/charts/puppetserver/templates/puppetserver-deployment-masters.yaml b/...lm-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 }}