From fa6b67c7fb9686e86151692ce7a6f42cd496712b Mon Sep 17 00:00:00 2001 From: portdirect Date: Tue, 30 Jan 2018 00:15:40 -0500 Subject: [PATCH] Ceph: Allow provisioner nodes selector to be specified This PS allows the provisioner node selector to be specified. Change-Id: If47ae2bb161dd36cb37e7572af1bd2b3a7cbf2c9 --- ceph/templates/deployment-cephfs-provisioner.yaml | 2 ++ ceph/templates/deployment-rbd-provisioner.yaml | 2 ++ ceph/values.yaml | 3 +++ 3 files changed, 7 insertions(+) diff --git a/ceph/templates/deployment-cephfs-provisioner.yaml b/ceph/templates/deployment-cephfs-provisioner.yaml index 3d898e875a..b79e7b6f48 100644 --- a/ceph/templates/deployment-cephfs-provisioner.yaml +++ b/ceph/templates/deployment-cephfs-provisioner.yaml @@ -144,6 +144,8 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "cephfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.provisioner.node_selector_key }}: {{ .Values.labels.provisioner.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ceph/templates/deployment-rbd-provisioner.yaml b/ceph/templates/deployment-rbd-provisioner.yaml index 4654af8ecf..0c8e973932 100644 --- a/ceph/templates/deployment-rbd-provisioner.yaml +++ b/ceph/templates/deployment-rbd-provisioner.yaml @@ -134,6 +134,8 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "rbd" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.provisioner.node_selector_key }}: {{ .Values.labels.provisioner.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ceph/values.yaml b/ceph/values.yaml index 9c6e6d1237..d3e348cbe0 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -37,6 +37,9 @@ labels: jobs: node_selector_key: openstack-control-plane node_selector_value: enabled + provisioner: + node_selector_key: openstack-control-plane + node_selector_value: enabled mon: node_selector_key: ceph-mon node_selector_value: enabled