Merge pull request #12 from Xtigyro/v151

Use default path for eYaml keys. Small linter fixes.

Author: Xtigyro

CHANGELOG.md

@@ -8,8 +8,9 @@ NOTE: The change log until version `v0.2.4` is auto-generated.
 ## [v1.4.0](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v1.4.0) (2019-12-03)
 
 - Add optional usage of pre-generated Puppet SSL certificates.
+- Use default path for eYaml keys.
 - Small Values file comment fixes.
-- Code clean-up.
+- Code clean-up and lint fixes.
 
 [Full Changelog](https://github.com/Xtigyro/puppetserver-helm-chart/compare/v1.3.1...v1.4.0)
 

Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 description: Puppet automates the delivery and operation of software.
-name: puppetserver
+name: puppetserver-helm-chart
 version: 1.4.0
 appVersion: 6.7.2
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]

templates/puppetserver-deployment.yaml

@@ -30,7 +30,7 @@ spec:
           command: [ "sh", "-c" ]
           args:
             - mkdir -p /etc/puppetlabs/code/environments;
-              mkdir -p /etc/puppetlabs/puppet/keys;
+              mkdir -p /etc/puppetlabs/puppet/eyaml;
               mkdir -p /etc/puppetlabs/puppet/manifests;
               chown -R puppet:puppet /etc/puppetlabs;
               {{- if .Values.hiera.config }}
@@ -40,12 +40,12 @@ spec:
               cp /etc/puppetlabs/puppet/configmap/site.pp /etc/puppetlabs/puppet/manifests/site.pp;
               chown puppet:puppet /etc/puppetlabs/puppet/manifests/site.pp;
               {{- if .Values.hiera.eyaml.private_key }}
-              cp /etc/puppetlabs/puppet/configmap/private_key.pkcs7.pem /etc/puppetlabs/puppet/keys/private_key.pkcs7.pem;
-              chown puppet:puppet /etc/puppetlabs/puppet/keys/private_key.pkcs7.pem;
+              cp /etc/puppetlabs/puppet/configmap/private_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/private_key.pkcs7.pem;
+              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/private_key.pkcs7.pem;
               {{- end }}
               {{- if .Values.hiera.eyaml.public_key }}
-              cp /etc/puppetlabs/puppet/configmap/public_key.pkcs7.pem /etc/puppetlabs/puppet/keys/public_key.pkcs7.pem;
-              chown puppet:puppet /etc/puppetlabs/puppet/keys/public_key.pkcs7.pem;
+              cp /etc/puppetlabs/puppet/configmap/public_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/public_key.pkcs7.pem;
+              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/public_key.pkcs7.pem;
               {{- end }}
           securityContext:
             runAsUser: 0

values.yaml

@@ -207,10 +207,11 @@ hiera:
   #  :hierarchy:
   #    - common
   #  :eyaml:
-  #    :datadir: /etc/puppetlabs/code/hiera-data   # keep unchanged
+  #    # Set branch name - e.g. "master", "%{::environment}", etc.
+  #    :datadir: /etc/puppetlabs/code/hiera-data/[branch]   # set branch name. keep base path unchanged.
   #    :extension: 'yaml'
-  #    :pkcs7_private_key: /etc/puppetlabs/puppet/keys/private_key.pkcs7.pem   # keep unchanged
-  #    :pkcs7_public_key:  /etc/puppetlabs/puppet/keys/public_key.pkcs7.pem   # keep unchanged
+  #    :pkcs7_private_key: /etc/puppetlabs/puppet/eyaml/private_key.pkcs7.pem   # keep unchanged
+  #    :pkcs7_public_key:  /etc/puppetlabs/puppet/eyaml/public_key.pkcs7.pem   # keep unchanged
   eyaml:
     ## A multi-line string
     private_key:  # |