Monitoring: Add toleration for promethues and grafana

k8s-cluster-monitor/config.libsonnet

@@ -23,7 +23,13 @@
       },
       etcdDashboards+:: {
         'etcd.json': (import 'dashboards/etcd.json'),
-      }
+      },
+
+      tolerations+:: [
+            {
+              operator: 'Exists',
+            },
+       ]
   },
 
 }

k8s-cluster-monitor/kubernetes-cluster-monitoring.jsonnet

@@ -13,6 +13,9 @@ local privateCloudConfig = {
     notKubeDnsSelector: 'job="kube-test"',
 };
 
+local statefulSet = k.apps.v1beta2.statefulSet;
+local toleration = statefulSet.mixin.spec.template.spec.tolerationsType;
+
 local cloud = (import 'kube-prometheus/kube-prometheus.libsonnet') + (import 'public-cloud-config.libsonnet');
 local cloudConfig = {
  namespace: 'monitoring',
@@ -43,6 +46,14 @@ local kp =  (if std.extVar("PrivateCloudEnv") == "true" then privateCloud else c
                },
       prometheus+: {
         spec+: {
+          tolerations: [
+            toleration.new() + (
+                  if std.objectHas(t, 'key') then toleration.withKey(t.key) else toleration) + (
+                  if std.objectHas(t, 'operator') then toleration.withOperator(t.operator) else toleration) + (
+                  if std.objectHas(t, 'value') then toleration.withValue(t.value) else toleration) + (
+                  if std.objectHas(t, 'effect') then toleration.withEffect(t.effect) else toleration),
+                  for t in config._config.tolerations
+          ],
           retention: '15d',
           storage: {
             volumeClaimTemplate:
@@ -195,7 +206,15 @@ local kp =  (if std.extVar("PrivateCloudEnv") == "true" then privateCloud else c
        deployment.mixin.spec.template.spec.withNodeSelector({ 'beta.kubernetes.io/os': 'linux' }) +
        deployment.mixin.spec.template.spec.withVolumes(volumes) +
        deployment.mixin.spec.template.spec.withServiceAccountName('grafana') +
-       deployment.mixin.spec.template.spec.withInitContainers(initContainer)
+       deployment.mixin.spec.template.spec.withInitContainers(initContainer) +
+       deployment.mixin.spec.template.spec.withTolerations([
+                                                                       toleration.new() + (
+                                                                             if std.objectHas(t, 'key') then toleration.withKey(t.key) else toleration) + (
+                                                                             if std.objectHas(t, 'operator') then toleration.withOperator(t.operator) else toleration) + (
+                                                                             if std.objectHas(t, 'value') then toleration.withValue(t.value) else toleration) + (
+                                                                             if std.objectHas(t, 'effect') then toleration.withEffect(t.effect) else toleration),
+                                                                             for t in config._config.tolerations
+                                                                     ])
   },
 };
 

k8s-cluster-monitor/manifests/prometheus/grafana-deployment.yaml

@@ -106,6 +106,8 @@ spec:
       nodeSelector:
         beta.kubernetes.io/os: linux
       serviceAccountName: grafana
+      tolerations:
+      - operator: Exists
       volumes:
       - name: grafana-storage
         persistentVolumeClaim:

k8s-cluster-monitor/manifests/prometheus/prometheus-prometheus.yaml

@@ -41,4 +41,6 @@ spec:
           requests:
             storage: 30Gi
         storageClassName: local-storage
+  tolerations:
+  - operator: Exists
   version: v2.7.2