Merge branch 'main' into affinity

Author: anthonysomerset

CHANGELOG.md

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: puppetserver
-version: 10.0.0
+version: 10.0.2
 appVersion: 8.8.0
 description: OpenVox automates the delivery and operation of software.
 keywords: ["OpenVox", "OpenVoxserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]

Chart.yaml

@@ -31,7 +31,9 @@ spec:
       targetPort: {{ .Values.metrics.prometheus.port }}
     {{- end }}
   {{- if eq .Values.puppetdb.service.type "ClusterIP" }}
-  clusterIP: {{ .Values.puppetdb.service.clusterIP  }}
+    {{- if hasKey .Values.puppetdb.service "clusterIP" }}
+  clusterIP: {{ .Values.puppetdb.service.clusterIP }}
+    {{- end }}
   {{- end }}
   selector:
     {{- include "puppetserver.puppetdb.matchLabels" . | nindent 4 }}

templates/puppetdb-service.yaml

@@ -9,7 +9,7 @@ manifest should match snapshot:
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: puppetserver
         app.kubernetes.io/version: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.2
         release: kube-prometheus-stack
       name: puppetserver-jmx
       namespace: puppet

tests/__snapshot__/jmx-servicemonitor_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: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.2
       name: puppetserver-puppetdb-claim
     spec:
       accessModes:

tests/__snapshot__/puppetdb-pvc_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: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.2
         release: kube-prometheus-stack
       name: puppetserver-puppetdb
       namespace: puppet

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: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.2
       name: puppetserver-puppetdb
     spec:
       egress:

tests/__snapshot__/puppetdb.networkpolicy_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: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.2
       name: puppetserver-ca-claim
     spec:
       accessModes:

tests/__snapshot__/puppetserver-ca-pvc_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: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.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: 8.8.0
-            helm.sh/chart: puppetserver-10.0.0
+            helm.sh/chart: puppetserver-10.0.2
         spec:
           containers:
             - env:

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: 8.8.0
-        helm.sh/chart: puppetserver-10.0.0
+        helm.sh/chart: puppetserver-10.0.2
       name: puppetserver-puppetserver-compilers
     spec:
       egress: