From 2aa6b3cf1c31e16c78ba0c9cf653b9a3be2c156d Mon Sep 17 00:00:00 2001 From: "Kabanov, Dmitrii" Date: Mon, 27 Apr 2020 16:07:33 -0700 Subject: [PATCH] [Ceph] Add kubernetes tolerations for ceph deployments The PS adds kubernetes tolerations for deployments from ceph-client, ceph-mon, ceph-provisioners and ceph-rgw charts. Change-Id: If96f5f2058fca6e145e537e95af39089f441ccbb --- .../templates/deployment-checkdns.yaml | 1 + ceph-client/templates/deployment-mds.yaml | 1 + ceph-client/templates/deployment-mgr.yaml | 1 + ceph-client/values.yaml | 31 +++++++++++++++++++ ceph-mon/templates/deployment-moncheck.yaml | 1 + ceph-mon/values.yaml | 11 +++++++ .../deployment-cephfs-provisioner.yaml | 1 + .../templates/deployment-rbd-provisioner.yaml | 1 + ceph-provisioners/values.yaml | 21 +++++++++++++ ceph-rgw/templates/deployment-rgw.yaml | 1 + ceph-rgw/values.yaml | 11 +++++++ 11 files changed, 81 insertions(+) diff --git a/ceph-client/templates/deployment-checkdns.yaml b/ceph-client/templates/deployment-checkdns.yaml index ee0f7eecd..e629168af 100644 --- a/ceph-client/templates/deployment-checkdns.yaml +++ b/ceph-client/templates/deployment-checkdns.yaml @@ -72,6 +72,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "ceph" "checkdns" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "checkdns" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.checkdns.node_selector_key }}: {{ .Values.labels.checkdns.node_selector_value }} initContainers: diff --git a/ceph-client/templates/deployment-mds.yaml b/ceph-client/templates/deployment-mds.yaml index 60dc8d318..0a624ea78 100644 --- a/ceph-client/templates/deployment-mds.yaml +++ b/ceph-client/templates/deployment-mds.yaml @@ -47,6 +47,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "ceph" "mds" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "mds" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.mds.node_selector_key }}: {{ .Values.labels.mds.node_selector_value }} initContainers: diff --git a/ceph-client/templates/deployment-mgr.yaml b/ceph-client/templates/deployment-mgr.yaml index c00e764ae..5bdd7cbbd 100644 --- a/ceph-client/templates/deployment-mgr.yaml +++ b/ceph-client/templates/deployment-mgr.yaml @@ -47,6 +47,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "ceph" "mgr" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "mgr" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.mgr.node_selector_key }}: {{ .Values.labels.mgr.node_selector_value }} hostNetwork: true diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 18a854244..534fb1314 100644 --- a/ceph-client/values.yaml +++ b/ceph-client/values.yaml @@ -178,6 +178,37 @@ pod: limits: memory: "50Mi" cpu: "500m" + tolerations: + checkdns: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 + mds: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 + mgr: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 secrets: keyrings: diff --git a/ceph-mon/templates/deployment-moncheck.yaml b/ceph-mon/templates/deployment-moncheck.yaml index 17ccc65d3..73d0c5fff 100644 --- a/ceph-mon/templates/deployment-moncheck.yaml +++ b/ceph-mon/templates/deployment-moncheck.yaml @@ -43,6 +43,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "ceph" "moncheck" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "mon_check" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.mon.node_selector_key }}: {{ .Values.labels.mon.node_selector_value }} initContainers: diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index afa7d1829..e07d1a19f 100644 --- a/ceph-mon/values.yaml +++ b/ceph-mon/values.yaml @@ -135,6 +135,17 @@ pod: limits: memory: "1024Mi" cpu: "2000m" + tolerations: + mon_check: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 secrets: keyrings: diff --git a/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml b/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml index c0e35e4d7..e96387a64 100644 --- a/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml +++ b/ceph-provisioners/templates/deployment-cephfs-provisioner.yaml @@ -156,6 +156,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "cephfs" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "cephfs_provisioner" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.provisioner.node_selector_key }}: {{ .Values.labels.provisioner.node_selector_value }} initContainers: diff --git a/ceph-provisioners/templates/deployment-rbd-provisioner.yaml b/ceph-provisioners/templates/deployment-rbd-provisioner.yaml index 45b61731c..4e2b34fb1 100644 --- a/ceph-provisioners/templates/deployment-rbd-provisioner.yaml +++ b/ceph-provisioners/templates/deployment-rbd-provisioner.yaml @@ -146,6 +146,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "rbd" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "rbd_provisioner" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.provisioner.node_selector_key }}: {{ .Values.labels.provisioner.node_selector_value }} initContainers: diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 2688a9951..ec1c258bd 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -150,6 +150,27 @@ pod: limits: memory: "1024Mi" cpu: "2000m" + tolerations: + rbd_provisioner: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 + cephfs_provisioner: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 secrets: keyrings: diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml index 1dce6f8d1..19888aff3 100644 --- a/ceph-rgw/templates/deployment-rgw.yaml +++ b/ceph-rgw/templates/deployment-rgw.yaml @@ -56,6 +56,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} affinity: {{ tuple $envAll "ceph" "rgw" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} +{{ tuple $envAll "rgw" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} nodeSelector: {{ .Values.labels.rgw.node_selector_key }}: {{ .Values.labels.rgw.node_selector_value }} initContainers: diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index cc0d40caa..2f6a3cc10 100644 --- a/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml @@ -171,6 +171,17 @@ pod: limits: memory: "1024Mi" cpu: "2000m" + tolerations: + rgw: + tolerations: + - effect: NoExecute + key: node.kubernetes.io/not-ready + operator: Exists + tolerationSeconds: 60 + - effect: NoExecute + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 network_policy: rgw: