Skip to content

Commit

Permalink
Update Vox Pupuli Containers (#217)
Browse files Browse the repository at this point in the history
* Update Vox Pupuli Containers

- update Puppetserver to 7.16.0-v1.4.0
- update PuppetDB to 7.17.1-v1.4.0
- update Puppetboard to 5.4.0

* update puppetserver to 7.17.0, puppetdb to 7.18.0 and update tests acordingly

* remove -v1.5.0 tag
  • Loading branch information
rwaffen authored Apr 19, 2024
1 parent 1e21891 commit bc1b312
Show file tree
Hide file tree
Showing 16 changed files with 50 additions and 50 deletions.
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: puppetserver
version: 9.3.4
appVersion: 7.13.0
version: 9.4.0
appVersion: 7.17.0
description: Puppet automates the delivery and operation of software.
keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
home: https://puppet.com/
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ If you prefer not to auto-sign or manually sign the Puppet Agents' CSRs - you ca
## Using Single CA

If you prefer, you can use a single externally issued CA - <https://puppet.com/docs/puppet/7/config_ssl_external_ca.html>.
If you prefer, you can use a single externally issued CA - <https://puppet.com/docs/puppet/7/config_ssl_external_ca.html>.
Enable it with `.Values.singleCA.enable`, add the crl.pem url with `.Values.singleCA.crl.url`.

Generate puppet & puppetdb secret (must be name `puppet.pem` & `puppetdb.pem`):
Expand All @@ -50,7 +50,7 @@ finally set `.Values.singleCA.certificates.existingSecret.puppetserver` and `.Va

Additionnaly, if you use a public certificate authority, you can't use private SAN name, so you have to override puppetdb name with `.Values.singleCA.puppetdb.overrideHostname` (with the full name ie: puppetdb.my.domain)

If you prefer, you can use crl update as cronjob instead of sidecar, it reduce resources utilization because only 1 pod is running.
If you prefer, you can use crl update as cronjob instead of sidecar, it reduce resources utilization because only 1 pod is running.
:warning: it may not work on multi zone cluster. that why it's not enable by default

## Horizontal Scaling
Expand All @@ -67,8 +67,8 @@ To achieve better throughput of Puppet Infrastructure, you can enable and scale

### Multiple PostgreSQL Read Replicas

For now it's not available anymore, since bitnami cleanned their old release. for multiple Postgresql we have to use postgresql-ha.
Read replica return an error on puppetdb:
For now it's not available anymore, since bitnami cleanned their old release. for multiple Postgresql we have to use postgresql-ha.
Read replica return an error on puppetdb:
`ERROR [p.p.c.services] Will retry database connection after temporary failure: java.sql.SQLTransientConnectionException: PDBMigrationsPool: default - Connection is not available, request timed out after 3002ms.`

## Deploy R10K as deployment
Expand Down Expand Up @@ -205,7 +205,7 @@ The following table lists the configurable parameters of the Puppetserver chart
| `global.extraEnvSecret`| add extra environment variables to all containers from pre-existing secret |``|
| `puppetserver.name` | puppetserver component label | `puppetserver`|
| `puppetserver.image` | puppetserver image | `voxpupuli/container-puppetserver`|
| `puppetserver.tag` | puppetserver img tag | `7.13.0`|
| `puppetserver.tag` | puppetserver img tag | `7.17.0-v1.5.0`|
| `puppetserver.pullPolicy` | puppetserver img pull policy | `IfNotPresent`|
| `puppetserver.persistence.data.existingClaim`| If non-empty, use a pre-defined PVC for puppet data |``|
| `puppetserver.persistence.data.accessModes`| If existingClaim is empty, the accessModes of the PVC created by the chart | the value of `storage.accessModes` |
Expand Down Expand Up @@ -395,7 +395,7 @@ The following table lists the configurable parameters of the Puppetserver chart
| `r10k.hiera.viaSsh.credentials.existingSecret`| r10k hiera data ssh secret that holds ssh key and known hosts files |``|
| `r10k.hiera.viaHttps.credentials.netrc.value`| r10k hiera data https .netrc file |``|
| `r10k.hiera.viaHttps.credentials.existingSecret`| r10k hiera data https secret that holds .netrc file contents in `netrc` key |``|
| `postgresql.*`| please refer to https://github.com/bitnami/charts/tree/main/bitnami/postgresql#parameters |``|
| `postgresql.*`| please refer to <https://github.com/bitnami/charts/tree/main/bitnami/postgresql#parameters> |``|
| `postgresql.primary.initdb.scriptsConfigMap` | postgres initdb scripts run at first boot |`postgresql-custom-extensions`|
| `postgresql.primary.persistence.enabled` | postgres database persistence |`true`|
| `postgresql.primary.persistence.existingClaim` | postgres manually managed pvc |``|
Expand All @@ -405,7 +405,7 @@ The following table lists the configurable parameters of the Puppetserver chart
| `puppetdb.enabled` | puppetdb component enabled |`true`|
| `puppetdb.name` | puppetdb component label | `puppetdb`|
| `puppetdb.image` | puppetdb img | `voxpupuli/container-puppetdb`|
| `puppetdb.tag` | puppetdb img tag | `7.14.0`|
| `puppetdb.tag` | puppetdb img tag | `7.18.0-v1.5.0`|
| `puppetdb.pullPolicy` | puppetdb img pull policy | `IfNotPresent`|
| `puppetdb.resources` | puppetdb resource limits |``|
| `puppetdb.extraEnv` | puppetdb additional container env vars |``|
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/jmx-servicemonitor_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
release: kube-prometheus-stack
name: puppetserver-jmx
namespace: puppet
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetdb-pvc_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppetdb-claim
spec:
accessModes:
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
release: kube-prometheus-stack
name: puppetserver-puppetdb
namespace: puppet
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppetdb
spec:
egress:
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-ca-claim
spec:
accessModes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppetserver-compiler
spec:
replicas: 1
Expand All @@ -30,8 +30,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
spec:
containers:
- env:
Expand All @@ -50,7 +50,7 @@ manifest should match snapshot:
- name: CA_MASTERPORT
value: "8140"
envFrom: null
image: ghcr.io/voxpupuli/container-puppetserver:7.13.0
image: ghcr.io/voxpupuli/container-puppetserver:7.17.0-v1.5.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -114,7 +114,7 @@ manifest should match snapshot:
- -c
env: null
envFrom: null
image: ghcr.io/voxpupuli/container-puppetserver:7.13.0
image: ghcr.io/voxpupuli/container-puppetserver:7.17.0-v1.5.0
imagePullPolicy: IfNotPresent
name: perms-and-dirs
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppetserver-compilers
spec:
egress:
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-compilers
spec:
maxUnavailable: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppetserver-compiler
spec:
podManagementPolicy: OrderedReady
Expand All @@ -31,8 +31,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
spec:
containers:
- env:
Expand All @@ -53,7 +53,7 @@ manifest should match snapshot:
- name: CA_MASTERPORT
value: "8140"
envFrom: null
image: ghcr.io/voxpupuli/container-puppetserver:7.13.0
image: ghcr.io/voxpupuli/container-puppetserver:7.17.0-v1.5.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -112,7 +112,7 @@ manifest should match snapshot:
- -c
env: null
envFrom: null
image: ghcr.io/voxpupuli/container-puppetserver:7.13.0
image: ghcr.io/voxpupuli/container-puppetserver:7.17.0-v1.5.0
imagePullPolicy: IfNotPresent
name: perms-and-dirs
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppetserver
spec:
egress:
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-masters
spec:
maxUnavailable: 2
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshot__/puppetserver-pvc_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.4
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-9.4.0
name: puppetserver-puppet-claim
spec:
accessModes:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.3
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-8.3.0
name: puppetserver-puppetserver-compiler
spec:
podManagementPolicy: OrderedReady
Expand All @@ -31,8 +31,8 @@ manifest should match snapshot:
app.kubernetes.io/instance: puppetserver
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: puppetserver
app.kubernetes.io/version: 7.13.0
helm.sh/chart: puppetserver-9.3.3
app.kubernetes.io/version: 7.17.0
helm.sh/chart: puppetserver-8.3.0
spec:
containers:
- env:
Expand All @@ -53,7 +53,7 @@ manifest should match snapshot:
- name: CA_MASTERPORT
value: "8140"
envFrom: null
image: ghcr.io/voxpupuli/container-puppetserver:7.13.0
image: ghcr.io/voxpupuli/container-puppetserver:7.17.0-v1.5.0
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -112,7 +112,7 @@ manifest should match snapshot:
- -c
env: null
envFrom: null
image: ghcr.io/voxpupuli/container-puppetserver:7.13.0
image: ghcr.io/voxpupuli/container-puppetserver:7.17.0-v1.5.0
imagePullPolicy: IfNotPresent
name: perms-and-dirs
resources:
Expand Down
6 changes: 3 additions & 3 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ global:
puppetserver:
name: puppetserver
image: ghcr.io/voxpupuli/container-puppetserver
tag: 7.13.0
tag: 7.17.0-v1.5.0
pullPolicy: IfNotPresent

## Configure persistence for Puppet Server
Expand Down Expand Up @@ -750,7 +750,7 @@ puppetdb:
enabled: true
name: puppetdb
image: ghcr.io/voxpupuli/container-puppetdb
tag: 7.14.0
tag: 7.18.0-v1.5.0
pullPolicy: IfNotPresent
resources: {}
# requests:
Expand Down Expand Up @@ -909,7 +909,7 @@ puppetboard:
enabled: false
name: puppetboard
image: ghcr.io/voxpupuli/puppetboard
tag: 4.2.5
tag: 5.4.0
port: 9090
pullPolicy: IfNotPresent
service:
Expand Down

0 comments on commit bc1b312

Please sign in to comment.