From 0bcd6d9742d1d1c2105a437d5df25c72681c5b92 Mon Sep 17 00:00:00 2001 From: Anthony Somerset Date: Thu, 9 May 2024 00:21:37 +0200 Subject: [PATCH] fixes #215 and allows customconfigs deployments in puppetdb (#227) * fixes #215 and allows customconfigs deployments in puppetdb * updating version/changelog and tests --- CHANGELOG.md | 3 +++ Chart.yaml | 2 +- templates/puppetdb-deployment.yaml | 5 ----- tests/__snapshot__/jmx-servicemonitor_test.yaml.snap | 2 +- tests/__snapshot__/puppetdb-pvc_test.yaml.snap | 2 +- tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap | 2 +- tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap | 2 +- tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap | 2 +- .../puppetserver-compilers.deployment_test.yaml.snap | 4 ++-- .../puppetserver-compilers.networkpolicy_test.yaml.snap | 2 +- tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap | 2 +- .../puppetserver-compilers.statefulset_test.yaml.snap | 4 ++-- .../puppetserver-masters.networkpolicy_test.yaml.snap | 2 +- tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap | 2 +- tests/__snapshot__/puppetserver-pvc_test.yaml.snap | 2 +- 15 files changed, 18 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad03f1e..08a4ff0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ numbering uses [semantic versioning](http://semver.org). NOTE: The change log until version `v0.2.4` is auto-generated. +## [v9.4.2](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v9.4.2) (2024-05-03) +- Fix: #215 fixed ability to use customconfigs with PuppetDB + ## [v9.4.1](https://github.com/puppetlabs/puppetserver-helm-chart/tree/v9.4.1) (2024-05-02) - Feat: allow option to import CA to only deal with CA and not puppetdb diff --git a/Chart.yaml b/Chart.yaml index 7f53365..75641cd 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: puppetserver -version: 9.4.1 +version: 9.4.2 appVersion: 7.17.0 description: Puppet automates the delivery and operation of software. keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"] diff --git a/templates/puppetdb-deployment.yaml b/templates/puppetdb-deployment.yaml index 6a658a8..d17e1cf 100644 --- a/templates/puppetdb-deployment.yaml +++ b/templates/puppetdb-deployment.yaml @@ -352,11 +352,6 @@ spec: configMap: name: {{ include "puppetdb.fullname" . }}-custom-configs {{- end }} - {{- if .Values.puppetdb.customconfigs.enabled }} - - name: puppetdb-custom-configs - configMap: - name: puppetdb-custom-configs - {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }} diff --git a/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap b/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap index d29cb6a..c55d922 100644 --- a/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap +++ b/tests/__snapshot__/jmx-servicemonitor_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 release: kube-prometheus-stack name: puppetserver-jmx namespace: puppet diff --git a/tests/__snapshot__/puppetdb-pvc_test.yaml.snap b/tests/__snapshot__/puppetdb-pvc_test.yaml.snap index 037cc67..8552fe3 100644 --- a/tests/__snapshot__/puppetdb-pvc_test.yaml.snap +++ b/tests/__snapshot__/puppetdb-pvc_test.yaml.snap @@ -10,7 +10,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppetdb-claim spec: accessModes: diff --git a/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap b/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap index ef3cf6e..0725356 100644 --- a/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap +++ b/tests/__snapshot__/puppetdb-servicemonitor_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 release: kube-prometheus-stack name: puppetserver-puppetdb namespace: puppet diff --git a/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap b/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap index cd6ed78..36d4418 100644 --- a/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap +++ b/tests/__snapshot__/puppetdb.networkpolicy_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppetdb spec: egress: diff --git a/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap b/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap index def4926..a558bcb 100644 --- a/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-ca-pvc_test.yaml.snap @@ -10,7 +10,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-ca-claim spec: accessModes: diff --git a/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap index 8639399..968546a 100644 --- a/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-compilers.deployment_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppetserver-compiler spec: replicas: 1 @@ -31,7 +31,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 spec: containers: - env: diff --git a/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap index 4ec4866..771bca8 100644 --- a/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-compilers.networkpolicy_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppetserver-compilers spec: egress: diff --git a/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap index 29da9d6..d501a4c 100644 --- a/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-compilers.pdb_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-compilers spec: maxUnavailable: 2 diff --git a/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap b/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap index aba0a84..58cfecc 100644 --- a/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-compilers.statefulset_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppetserver-compiler spec: podManagementPolicy: OrderedReady @@ -32,7 +32,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 spec: containers: - env: diff --git a/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap b/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap index 6f383dc..5e9678d 100644 --- a/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-masters.networkpolicy_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppetserver spec: egress: diff --git a/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap b/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap index e12c23b..afb734d 100644 --- a/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-masters.pdb_test.yaml.snap @@ -9,7 +9,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-masters spec: maxUnavailable: 2 diff --git a/tests/__snapshot__/puppetserver-pvc_test.yaml.snap b/tests/__snapshot__/puppetserver-pvc_test.yaml.snap index 8b4427c..f85cd30 100644 --- a/tests/__snapshot__/puppetserver-pvc_test.yaml.snap +++ b/tests/__snapshot__/puppetserver-pvc_test.yaml.snap @@ -10,7 +10,7 @@ manifest should match snapshot: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: puppetserver app.kubernetes.io/version: 7.17.0 - helm.sh/chart: puppetserver-9.4.1 + helm.sh/chart: puppetserver-9.4.2 name: puppetserver-puppet-claim spec: accessModes: