From 8629be1470c6442f8b842080fbd535e07e856f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Mon, 26 Apr 2021 20:57:48 +0200 Subject: [PATCH] Use official Puppetboard image, use port 9090, and allow extra PuppetDB containers. (#84) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * 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 * Update Credits Signed-off-by: Raphaël Pinson * CHANGELOG: prepare release 5.4.0 * Add maintainer Signed-off-by: Raphaël Pinson * Add raphink Co-authored-by: Miroslav Hadzhiev --- CHANGELOG.md | 4 ++++ CODEOWNERS | 2 +- Chart.yaml | 4 +++- README.md | 2 ++ templates/puppetdb-deployment.yaml | 7 ++++++- templates/puppetdb-service.yaml | 2 +- values.yaml | 5 +++-- 7 files changed, 20 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c13682..b610ede9 100644 --- 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 index 85664bf5..db2bec43 100644 --- 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 index 5d2b8ae8..5926e9b0 100644 --- 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: morgan@puppet.com - name: slconley email: slconley@gmail.com + - name: raphink + email: raphael.pinson@camptocamp.com - name: Pupperware Team email: pupperware@puppet.com engine: gotpl diff --git a/README.md b/README.md index 8c3ed851..14802d9f 100644 --- 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:pupperware@puppet.com), Co-Author and Owner * [Morgan Rhodes](mailto:morgan@puppet.com), 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 index bf26f8d3..3f72d724 100644 --- 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 index caddc861..ab30aa66 100644 --- 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 index 322194c3..20b8e2d9 100644 --- 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: