feat(eyaml): allow more than one pub/priv keypair in existing eyaml key map (#99)

* feat(eyaml): allow more than one pub/priv keypair in existing eyaml key map

Signed-off-by: Raphaël Pinson <raphael.pinson@camptocamp.com>

* chore: bump version and update CHANGELOG

Signed-off-by: Raphaël Pinson <raphael.pinson@camptocamp.com>

Author: raphink

CHANGELOG.md

@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version `v0.2.4` is auto-generated.
 
+## [v5.13.0](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v5.13.0) (2021-11-29)
+
+- feat(eyaml): allow more than one pub/priv keypair in existing eyaml key map
+
 ## [v5.12.0](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v5.12.0) (2021-09-21)
 
 - feat: add support for Ingress `pathType` and `ingressClassName`.

Chart.yaml

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

templates/puppetserver-deployment-masters.yaml

@@ -81,12 +81,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 or (.Values.hiera.eyaml.private_key) (.Values.hiera.eyaml.existingMap) }}
-              cp /etc/puppetlabs/puppet/configmap/eyaml/private_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/private_key.pkcs7.pem;
-              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/private_key.pkcs7.pem;
+              cp /etc/puppetlabs/puppet/configmap/eyaml/*private_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/;
+              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/*private_key.pkcs7.pem;
               {{- end }}
               {{- if or (.Values.hiera.eyaml.public_key) (.Values.hiera.eyaml.existingMap) }}
-              cp /etc/puppetlabs/puppet/configmap/eyaml/public_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/public_key.pkcs7.pem;
-              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/public_key.pkcs7.pem;
+              cp /etc/puppetlabs/puppet/configmap/eyaml/*public_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/;
+              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/*public_key.pkcs7.pem;
               {{- end }}
           securityContext:
             runAsUser: 0

templates/puppetserver-statefulset-compilers.yaml

@@ -69,12 +69,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 or (.Values.hiera.eyaml.private_key) (.Values.hiera.eyaml.existingMap) }}
-              cp /etc/puppetlabs/puppet/configmap/eyaml/private_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/private_key.pkcs7.pem;
-              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/private_key.pkcs7.pem;
+              cp /etc/puppetlabs/puppet/configmap/eyaml/*private_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/;
+              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/*private_key.pkcs7.pem;
               {{- end }}
               {{- if or (.Values.hiera.eyaml.public_key) (.Values.hiera.eyaml.existingMap) }}
-              cp /etc/puppetlabs/puppet/configmap/eyaml/public_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/public_key.pkcs7.pem;
-              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/public_key.pkcs7.pem;
+              cp /etc/puppetlabs/puppet/configmap/eyaml/*public_key.pkcs7.pem /etc/puppetlabs/puppet/eyaml/keys/;
+              chown puppet:puppet /etc/puppetlabs/puppet/eyaml/keys/*public_key.pkcs7.pem;
               {{- end }}
           securityContext:
             runAsUser: 0