Add PV/PVC Selector.

Signed-off-by: Miroslav Hadzhiev <miroslav.hadzhiev@gmail.com>
helm · Oct 30, 2019 · a09c244 · a09c244
1 parent 4898a56
commit a09c244
Show file tree

Hide file tree

Showing 12 changed files with 243 additions and 340 deletions.
diff --git a/stable/puppetserver/CHANGELOG.md b/stable/puppetserver/CHANGELOG.md
@@ -5,6 +5,12 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version `v0.2.4` is auto-generated.
 
+## [v0.3.5](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v0.3.5) (2019-10-31)
+- Add Optional `selector` for PVs/PVCs.
+- Switch to Apache v2.0 License.
+
+[Full Changelog](https://github.com/Xtigyro/puppetserver-helm-chart/compare/v0.3.4...v0.3.5)
+
 ## [v0.3.4](https://github.com/Xtigyro/puppetserver-helm-chart/tree/v0.3.4) (2019-10-28)
 - Add Ingress.
 - Improve Tmpl Helpers.

diff --git a/stable/puppetserver/Chart.yaml b/stable/puppetserver/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Puppet automates the delivery and operation of software.
 name: puppetserver
-version: 0.3.4
+version: 0.3.5
 appVersion: 6.7.1
 keywords: ["puppet", "puppetserver", "automation", "iac", "infrastructure", "cm", "ci", "cd"]
 home: https://puppet.com/

diff --git a/stable/puppetserver/LICENSE b/stable/puppetserver/LICENSE
diff --git a/stable/puppetserver/README.md b/stable/puppetserver/README.md
@@ -144,6 +144,7 @@ Parameter | Description | Default
 `priorityClass`| Leverage a priorityClass to ensure your pods survive resource shortages |``
 `podAnnotations`| Extra Pod annotations |``
 `storage.storageClass`| Storage Class |``
+`storage.selector`| PVs/PVCs Selector Config |`false`
 `storage.annotations`| Storage annotations |``
 `storage.size`| PVCs Storage Size |`100Mi`
 

diff --git a/stable/puppetserver/templates/hiera-pvc.yaml b/stable/puppetserver/templates/hiera-pvc.yaml
@@ -9,6 +9,11 @@ metadata:
 {{ toYaml .Values.storage.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.storage.selector }}
+  selector:
+    matchLabels:
+      {{- include "puppetserver.hiera.matchLabels" . | nindent 6 }}
+  {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/stable/puppetserver/templates/postgres-pvc.yaml b/stable/puppetserver/templates/postgres-pvc.yaml
@@ -9,6 +9,11 @@ metadata:
 {{ toYaml .Values.storage.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.storage.selector }}
+  selector:
+    matchLabels:
+      {{- include "puppetserver.postgres.matchLabels" . | nindent 6 }}
+  {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/stable/puppetserver/templates/puppetdb-pvc.yaml b/stable/puppetserver/templates/puppetdb-pvc.yaml
@@ -9,6 +9,11 @@ metadata:
 {{ toYaml .Values.storage.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.storage.selector }}
+  selector:
+    matchLabels:
+      {{- include "puppetserver.puppetdb.matchLabels" . | nindent 6 }}
+  {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/stable/puppetserver/templates/puppetserver-code-pvc.yaml b/stable/puppetserver/templates/puppetserver-code-pvc.yaml
@@ -9,6 +9,11 @@ metadata:
 {{ toYaml .Values.storage.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.storage.selector }}
+  selector:
+    matchLabels:
+      {{- include "puppetserver.puppetserver.matchLabels" . | nindent 6 }}
+  {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/stable/puppetserver/templates/puppetserver-data-pvc.yaml b/stable/puppetserver/templates/puppetserver-data-pvc.yaml
@@ -9,6 +9,11 @@ metadata:
 {{ toYaml .Values.storage.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.storage.selector }}
+  selector:
+    matchLabels:
+      {{- include "puppetserver.puppetserver.matchLabels" . | nindent 6 }}
+  {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/stable/puppetserver/templates/puppetserver-pvc.yaml b/stable/puppetserver/templates/puppetserver-pvc.yaml
@@ -9,6 +9,11 @@ metadata:
 {{ toYaml .Values.storage.annotations | nindent 4 }}
 {{- end }}
 spec:
+  {{- if .Values.storage.selector }}
+  selector:
+    matchLabels:
+      {{- include "puppetserver.puppetserver.matchLabels" . | nindent 6 }}
+  {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:

diff --git a/stable/puppetserver/templates/r10k-cronjob.yaml b/stable/puppetserver/templates/r10k-cronjob.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     {{- include "puppetserver.r10k.labels" . | nindent 4 }}
 spec:
+  selector:
+    matchLabels:
+      {{- include "puppetserver.r10k.matchLabels" . | nindent 6 }}
   schedule: "{{.Values.r10k.cronJob.schedule}}"
   jobTemplate:
     spec:

diff --git a/stable/puppetserver/values.yaml b/stable/puppetserver/values.yaml
@@ -276,5 +276,6 @@ storage:
   ##   GKE, AWS & OpenStack)
   ##
   storageClass: ""
+  selector: false
   annotations: {}
   size: 100Mi