Allow to use selectors with volumeClaimTemplates (#286)
* Allow to use selectors with volumeClaimTemplates * Fixed naming inconsistency, added null value Co-authored-by: Claudio Vellage <claudio.vellage@pm.me> Co-authored-by: Michael Marshall <mmarshall@apache.org> ### Motivation Currently it's not possible to use selectors with volumeClaimTemplates which makes it hard/impossible to bind statically provisioned PVs. ### Modifications Added (optional) selectors to `volumeClaimTemplates` and documented in values file. ### Verifying this change - [ ] Make sure that the change passes the CI checks.
This commit is contained in:
parent
1e8491aebd
commit
343ce0527d
@ -248,6 +248,10 @@ spec:
|
|||||||
{{- else if and .Values.volumes.local_storage .Values.bookkeeper.volumes.common.local_storage }}
|
{{- else if and .Values.volumes.local_storage .Values.bookkeeper.volumes.common.local_storage }}
|
||||||
storageClassName: "local-storage"
|
storageClassName: "local-storage"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.bookkeeper.volumes.common.selector }}
|
||||||
|
selector:
|
||||||
|
{{- toYaml . | nindent 10 }}
|
||||||
|
{{- end }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{- if .Values.bookkeeper.volumes.journal.useMultiVolumes }}
|
{{- if .Values.bookkeeper.volumes.journal.useMultiVolumes }}
|
||||||
{{- $fullname := include "pulsar.fullname" . -}}
|
{{- $fullname := include "pulsar.fullname" . -}}
|
||||||
@ -263,6 +267,10 @@ spec:
|
|||||||
{{- if .storageClassName }}
|
{{- if .storageClassName }}
|
||||||
storageClassName: "{{ .storageClassName }}"
|
storageClassName: "{{ .storageClassName }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.bookkeeper.volumes.journal.selector }}
|
||||||
|
selector:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
- metadata:
|
- metadata:
|
||||||
@ -279,6 +287,10 @@ spec:
|
|||||||
{{- else if and .Values.volumes.local_storage .Values.bookkeeper.volumes.journal.local_storage }}
|
{{- else if and .Values.volumes.local_storage .Values.bookkeeper.volumes.journal.local_storage }}
|
||||||
storageClassName: "local-storage"
|
storageClassName: "local-storage"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.bookkeeper.volumes.journal.selector }}
|
||||||
|
selector:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.bookkeeper.volumes.ledgers.useMultiVolumes }}
|
{{- if .Values.bookkeeper.volumes.ledgers.useMultiVolumes }}
|
||||||
{{- $fullname := include "pulsar.fullname" . -}}
|
{{- $fullname := include "pulsar.fullname" . -}}
|
||||||
@ -294,6 +306,10 @@ spec:
|
|||||||
{{- if .storageClassName }}
|
{{- if .storageClassName }}
|
||||||
storageClassName: "{{ .storageClassName }}"
|
storageClassName: "{{ .storageClassName }}"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.bookkeeper.volumes.ledgers.selector }}
|
||||||
|
selector:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
- metadata:
|
- metadata:
|
||||||
@ -310,6 +326,10 @@ spec:
|
|||||||
{{- else if and .Values.volumes.local_storage .Values.bookkeeper.volumes.ledgers.local_storage }}
|
{{- else if and .Values.volumes.local_storage .Values.bookkeeper.volumes.ledgers.local_storage }}
|
||||||
storageClassName: "local-storage"
|
storageClassName: "local-storage"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.bookkeeper.volumes.ledgers.selector }}
|
||||||
|
selector:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@ -268,5 +268,9 @@ spec:
|
|||||||
{{- else if and .Values.volumes.local_storage .Values.zookeeper.volumes.data.local_storage }}
|
{{- else if and .Values.volumes.local_storage .Values.zookeeper.volumes.data.local_storage }}
|
||||||
storageClassName: "local-storage"
|
storageClassName: "local-storage"
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- with .Values.zookeeper.volumes.data.selector }}
|
||||||
|
selector:
|
||||||
|
{{- toYaml . | nindent 8 }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|||||||
@ -367,6 +367,11 @@ zookeeper:
|
|||||||
# type: pd-ssd
|
# type: pd-ssd
|
||||||
# fsType: xfs
|
# fsType: xfs
|
||||||
# provisioner: kubernetes.io/gce-pd
|
# provisioner: kubernetes.io/gce-pd
|
||||||
|
## If you want to bind static persistent volumes via selectors, e.g.:
|
||||||
|
# selector:
|
||||||
|
# matchLabels:
|
||||||
|
# app: pulsar-zookeeper
|
||||||
|
selector: {}
|
||||||
# External zookeeper server list in case of global-zk list to create zk cluster across zk deployed on different clusters/namespaces
|
# External zookeeper server list in case of global-zk list to create zk cluster across zk deployed on different clusters/namespaces
|
||||||
# Example value: "us-east1-pulsar-zookeeper-0.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-1.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-2.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-0.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-1.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-2.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888"
|
# Example value: "us-east1-pulsar-zookeeper-0.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-1.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-east1-pulsar-zookeeper-2.us-east1-pulsar-zookeeper.us-east1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-0.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-1.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888,us-west1-pulsar-zookeeper-2.us-west1-pulsar-zookeeper.us-west1.svc.cluster.local:2888:3888"
|
||||||
externalZookeeperServerList: ""
|
externalZookeeperServerList: ""
|
||||||
@ -501,6 +506,11 @@ bookkeeper:
|
|||||||
# type: pd-ssd
|
# type: pd-ssd
|
||||||
# fsType: xfs
|
# fsType: xfs
|
||||||
# provisioner: kubernetes.io/gce-pd
|
# provisioner: kubernetes.io/gce-pd
|
||||||
|
## If you want to bind static persistent volumes via selectors, e.g.:
|
||||||
|
# selector:
|
||||||
|
# matchLabels:
|
||||||
|
# app: pulsar-bookkeeper-journal
|
||||||
|
selector: {}
|
||||||
useMultiVolumes: false
|
useMultiVolumes: false
|
||||||
multiVolumes:
|
multiVolumes:
|
||||||
- name: journal0
|
- name: journal0
|
||||||
@ -518,6 +528,8 @@ bookkeeper:
|
|||||||
# storageClassName:
|
# storageClassName:
|
||||||
# storageClass:
|
# storageClass:
|
||||||
# ...
|
# ...
|
||||||
|
# selector:
|
||||||
|
# ...
|
||||||
useMultiVolumes: false
|
useMultiVolumes: false
|
||||||
multiVolumes:
|
multiVolumes:
|
||||||
- name: ledgers0
|
- name: ledgers0
|
||||||
@ -538,6 +550,8 @@ bookkeeper:
|
|||||||
# storageClassName:
|
# storageClassName:
|
||||||
# storageClass: ## this is common too
|
# storageClass: ## this is common too
|
||||||
# ...
|
# ...
|
||||||
|
# selector:
|
||||||
|
# ...
|
||||||
|
|
||||||
## Bookkeeper configmap
|
## Bookkeeper configmap
|
||||||
## templates/bookkeeper-configmap.yaml
|
## templates/bookkeeper-configmap.yaml
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user