Use official Puppetboard image, use port 9090, and allow extra Puppet…

…DB containers. (#84) * Use official Puppetboard image - upgrade to Puppetboard 3.0.0 - use port 9090 by default, so it can run as non-root Signed-off-by: Raphaël Pinson <[email protected]> * Allow to inject containers in the PuppetDB Pod This allows to add an authentication proxy for Puppetboard for example. Signed-off-by: Raphaël Pinson <[email protected]> * Update Credits Signed-off-by: Raphaël Pinson <[email protected]> * CHANGELOG: prepare release 5.4.0 * Add maintainer Signed-off-by: Raphaël Pinson <[email protected]> * Add raphink Co-authored-by: Miroslav Hadzhiev <[email protected]>
puppetlabs · Apr 26, 2021 · 8629be1 · 8629be1
1 parent 4149c48
commit 8629be1
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/CHANGELOG.md b/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.4.0](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v5.4.0) (2021-04-26)
+
+- Use official Puppetboard image, use port 9090, and allow extra PuppetDB containers.
+
 ## [v5.3.0](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v5.3.0) (2021-04-22)
 
 - Add ability to ovewrite PuppetBoard variables in order to work properly with newer PuppetDB versions.

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,3 +1,3 @@
 # This repository is owned by Puppet's Platform Services team and community partners
 
-* @puppetlabs/platform-services @Xtigyro
+* @puppetlabs/platform-services @Xtigyro @raphink
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: puppetserver
-version: 5.3.0
+version: 5.4.0
 appVersion: 6.12.1
 description: Puppet automates the delivery and operation of software.
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
@@ -17,6 +17,8 @@ maintainers:
     email: [email protected]
   - name: slconley
     email: [email protected]
+  - name: raphink
+    email: [email protected]
   - name: Pupperware Team
     email: [email protected]
 engine: gotpl

diff --git a/README.md b/README.md
@@ -247,6 +247,7 @@ The following table lists the configurable parameters of the Puppetserver chart
 | `puppetboard.name` | puppetboard component label | `puppetboard`|
 | `puppetboard.image` | puppetboard img | `xtigyro/puppetboard`|
 | `puppetboard.tag` | puppetboard img tag | `2.1.2`|
+| `puppetboard.port` | puppetboard container port | `9090`|
 | `puppetboard.pullPolicy` | puppetboard img pull policy | `IfNotPresent`|
 | `puppetboard.resources` | puppetboard resource limits |``|
 | `puppetboard.extraEnv` | puppetboard additional container env vars |``|
@@ -335,6 +336,7 @@ kill %[job_numbers_above]
 * [Pupperware Team](mailto:[email protected]), Co-Author and Owner
 * [Morgan Rhodes](mailto:[email protected]), Maintainer
 * [Sean Conley](https://www.linkedin.com/in/seanconley/), Maintainer
+* [Raphaël Pinson](https://github.com/raphink), Maintainer
 * [Scott Cressi](https://www.linkedin.com/in/scottcressi/), Co-Author
 * [Kai Sisterhenn](https://www.sistason.de/), Contributor
 * [chwehrli](https://github.com/chwehrli), Contributor

diff --git a/templates/puppetdb-deployment.yaml b/templates/puppetdb-deployment.yaml
@@ -21,6 +21,9 @@ spec:
     spec:
       hostname: puppetdb
       containers:
+        {{- if .Values.puppetdb.containers }}
+          {{ toYaml .Values.puppetdb.containers | indent 8 }}
+        {{- end }}
         - name: puppetdb
           image: "{{.Values.puppetdb.image}}:{{.Values.puppetdb.tag}}"
           imagePullPolicy: "{{.Values.puppetdb.pullPolicy}}"
@@ -80,13 +83,15 @@ spec:
               value: "/opt/puppetlabs/server/data/puppetdb/certs/certs/public.pem"
             - name: PUPPETDB_KEY
               value: "/opt/puppetlabs/server/data/puppetdb/certs/private_keys/private.pem"
+            - name: PUPPETBOARD_PORT
+              value: {{ .Values.puppetboard.port | quote }}
             {{- range $key, $value := .Values.puppetboard.extraEnv }}
             - name: {{ $key }}
               value: "{{ $value }}"
             {{- end }}
           ports:
             - name: puppetboard
-              containerPort: 80
+              containerPort: {{ .Values.puppetboard.port }}
           volumeMounts:
             - name: puppetdb-storage
               mountPath: /opt/puppetlabs/server/data/puppetdb/certs

diff --git a/templates/puppetdb-service.yaml b/templates/puppetdb-service.yaml
@@ -12,7 +12,7 @@ spec:
       port: 8081
     {{- if .Values.puppetboard.enabled }}
     - name: puppetboard
-      port: 80
+      port: {{ .Values.puppetboard.port }}
     {{- end }}
   selector:
     {{- include "puppetserver.puppetdb.matchLabels" . | nindent 4 }}
diff --git a/values.yaml b/values.yaml
@@ -433,8 +433,9 @@ postgresql:
 puppetboard:
   enabled: false
   name: puppetboard
-  image: xtigyro/puppetboard
-  tag: 2.2.0
+  image: ghcr.io/voxpupuli/puppetboard
+  tag: 3.0.0
+  port: 9090
   pullPolicy: IfNotPresent
   resources: {}
   #  requests: