Turn "selector" for PVs/PVCs off by Default

puppetlabs · Oct 30, 2019 · 7e9476a · 7e9476a
1 parent fda4de8
commit 7e9476a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 0 deletions.
diff --git a/templates/hiera-pvc.yaml b/templates/hiera-pvc.yaml
@@ -9,9 +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/templates/postgres-pvc.yaml b/templates/postgres-pvc.yaml
@@ -9,9 +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/templates/puppetdb-pvc.yaml b/templates/puppetdb-pvc.yaml
@@ -9,9 +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/templates/puppetserver-code-pvc.yaml b/templates/puppetserver-code-pvc.yaml
@@ -9,9 +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/templates/puppetserver-data-pvc.yaml b/templates/puppetserver-data-pvc.yaml
@@ -9,9 +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/templates/puppetserver-pvc.yaml b/templates/puppetserver-pvc.yaml
@@ -9,9 +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/values.yaml b/values.yaml
@@ -276,5 +276,6 @@ storage:
   ##   GKE, AWS & OpenStack)
   ##
   storageClass: ""
+  selector: false
   annotations: {}
   size: 100Mi