monitoring: deploy prometheus-adapter

This should enable the `metrics.k8s.io` API, and as such reinstate the `kubectl top` functionality and allow the `HorizontalPodAutoscaler` controller to work. The chart is rendered using ``` $ ./charts/render.py prometheus-adapter metalk8s-monitoring charts/prometheus-adapter.yaml charts/prometheus-adapter/ > salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls ``` Fixes: #2049 See: #2049
scality · Nov 19, 2019 · c1c2b2a · c1c2b2a
1 parent 5756483
commit c1c2b2a
Show file tree

Hide file tree

Showing 8 changed files with 489 additions and 8 deletions.
diff --git a/buildchain/buildchain/constants.py b/buildchain/buildchain/constants.py
@@ -17,14 +17,15 @@
 CMD_WIDTH : int = 14
 
 # URLs of the main container repositories.
-CALICO_REPOSITORY     : str = 'quay.io/calico'
-COREOS_REPOSITORY     : str = 'quay.io/coreos'
-DOCKER_REPOSITORY     : str = 'docker.io/library'
-GOOGLE_REPOSITORY     : str = 'k8s.gcr.io'
-GRAFANA_REPOSITORY    : str = 'docker.io/grafana'
-INGRESS_REPOSITORY    : str = 'quay.io/kubernetes-ingress-controller'
-KIWIGRID_REPOSITORY   : str = 'docker.io/kiwigrid'
-PROMETHEUS_REPOSITORY : str = 'quay.io/prometheus'
+CALICO_REPOSITORY             : str = 'quay.io/calico'
+COREOS_REPOSITORY             : str = 'quay.io/coreos'
+DOCKER_REPOSITORY             : str = 'docker.io/library'
+GOOGLE_REPOSITORY             : str = 'k8s.gcr.io'
+GRAFANA_REPOSITORY            : str = 'docker.io/grafana'
+INGRESS_REPOSITORY            : str = 'quay.io/kubernetes-ingress-controller'
+KIWIGRID_REPOSITORY           : str = 'docker.io/kiwigrid'
+PROMETHEUS_ADAPTER_REPOSITORY : str = 'docker.io/directxman12'
+PROMETHEUS_REPOSITORY         : str = 'quay.io/prometheus'
 
 # Paths {{{
 

diff --git a/buildchain/buildchain/image.py b/buildchain/buildchain/image.py
@@ -191,6 +191,9 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
     constants.KIWIGRID_REPOSITORY: [
         'k8s-sidecar',
     ],
+    constants.PROMETHEUS_ADAPTER_REPOSITORY: [
+        'k8s-prometheus-adapter-amd64',
+    ],
     constants.PROMETHEUS_REPOSITORY: [
         'alertmanager',
         'node-exporter',

diff --git a/buildchain/buildchain/salt_tree.py b/buildchain/buildchain/salt_tree.py
@@ -216,6 +216,9 @@ def _get_parts(self) -> Iterator[str]:
         renderer=targets.Renderer.JSON,
     ),
 
+    Path('salt/metalk8s/addons/prometheus-adapter/deployed/chart.sls'),
+    Path('salt/metalk8s/addons/prometheus-adapter/deployed/init.sls'),
+
     Path('salt/metalk8s/addons/prometheus-operator/deployed/chart.sls'),
     Path('salt/metalk8s/addons/prometheus-operator/deployed/cleanup.sls'),
     Path('salt/metalk8s/addons/prometheus-operator/deployed/dashboards.sls'),

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -173,6 +173,11 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
         version='v2.12.0',
         digest='sha256:cd93b8711bb92eb9c437d74217311519e0a93bc55779aa664325dc83cd13cb3',
     ),
+    Image(
+        name='k8s-prometheus-adapter-amd64',
+        version='v0.5.0',
+        digest='sha256:acf4c4dc6aaa51e3004eebdc410b509db45d1a6ebd255457c5745f0b4671678f',
+    ),
     Image(
         name='prometheus-config-reloader',
         version='v0.32.0',

diff --git a/charts/prometheus-adapter.yaml b/charts/prometheus-adapter.yaml
@@ -0,0 +1,47 @@
+image:
+  repository: '{%- endraw -%}{{ build_image_name(\"k8s-prometheus-adapter-amd64\", False) }}{%- raw -%}'
+
+nodeSelector:
+  node-role.kubernetes.io/infra: ''
+
+prometheus:
+  url: http://prometheus-operator-prometheus
+
+replicas: 2
+
+rules:
+  resource:
+    cpu:
+      containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[3m])) by (<<.GroupBy>>)
+      nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[3m])) by (<<.GroupBy>>)
+      resources:
+        overrides:
+          node:
+            resource: node
+          namespace:
+            resource: namespace
+          pod_name:
+            resource: pod
+      containerLabel: container_name
+    memory:
+      containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+      nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
+      resources:
+        overrides:
+          node:
+            resource: node
+          namespace:
+            resource: namespace
+          pod_name:
+            resource: pod
+      containerLabel: container_name
+    window: 3m
+
+
+tolerations:
+  - key: 'node-role.kubernetes.io/bootstrap'
+    operator: 'Exists'
+    effect: 'NoSchedule'
+  - key: 'node-role.kubernetes.io/infra'
+    operator: 'Exists'
+    effect: 'NoSchedule'