From 3a1d501041268efcf95e37192788e31c2fc33e10 Mon Sep 17 00:00:00 2001
From: Ashish Jaiswal <ashish@obmondo.com>
Date: Wed, 14 Aug 2024 02:01:25 +0530
Subject: [PATCH] added enc support and updated readme as well

---
 argocd-helm-charts/puppetserver/README.md   |  8 ++++++++
 argocd-helm-charts/puppetserver/values.yaml | 22 +++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/argocd-helm-charts/puppetserver/README.md b/argocd-helm-charts/puppetserver/README.md
index e4b0c91f1..8e930fce4 100644
--- a/argocd-helm-charts/puppetserver/README.md
+++ b/argocd-helm-charts/puppetserver/README.md
@@ -20,3 +20,11 @@ kubectl create secret generic hiera-git-secret --dry-run=client --from-file=netr
 ```sh
 kubectl create secret generic puppet-git-secret --dry-run=client --from-file=netrc=./netrc.enableit -o yaml | kubeseal --controller-namespace system --controller-name sealed-secrets --format yaml
 ```
+
+## Environment name
+
+* Env name gets changed, when using hyphen, so watch out for that
+
+```
+Environment "adding-users-in-computer10" contained non-word characters, correcting name to adding_users_in_computer10
+```
diff --git a/argocd-helm-charts/puppetserver/values.yaml b/argocd-helm-charts/puppetserver/values.yaml
index 6cdc7e647..5819ca8c2 100644
--- a/argocd-helm-charts/puppetserver/values.yaml
+++ b/argocd-helm-charts/puppetserver/values.yaml
@@ -7,6 +7,18 @@ puppetserver:
     masters:
       ingress:
         enabled: false
+      customentrypoints:
+        enabled: true
+        configmaps: |-
+          #!/bin/bash
+
+          set -e
+
+          # Configure puppet to use a certificate autosign script (if it exists)
+          # AUTOSIGN=true|false|path_to_autosign.conf
+          if test -n "${PUPPETSERVER_ENC_PATH}" ; then
+            puppet config set external_nodes "$PUPPETSERVER_ENC_PATH" --section server
+          fi
 
   r10k:
     asSidecar: false
@@ -15,6 +27,10 @@ puppetserver:
         credentials:
           existingSecret: puppet-git-secret
 
+  hiera:
+    name: hiera
+    hieradataurl: ""
+
   postgresql:
     enabled: false
 
@@ -40,13 +56,11 @@ puppetserver:
       jmx:
         enabled: false
 
-  hiera:
-    name: hiera
-    hieradataurl: ""
-
   global:
     extraEnv:
       AUTOSIGN: /etc/puppetlabs/code/environments/master/puppet_autosign.rb
+      PUPPET_REPORTS: puppetdb,prometheus
+      PUPPETSERVER_ENC_PATH: /etc/puppetlabs/code/environments/master/puppet_enc.rb
     postgresql:
       auth:
         existingSecret: puppetserver-pgsql-app