From babc6b820c841b29099da24cb86adfb71be0746a Mon Sep 17 00:00:00 2001
From: faruryo <faruryo@gmail.com>
Date: Sun, 9 May 2021 23:26:47 +0900
Subject: [PATCH] Fix scheduler and controller selectors for Kubespray
- refs:https://github.com/prometheus-operator/kube-prometheus/pull/916
- kubespray uses kubeadm, so it is good to inherit it
---
.../platforms/kubespray.libsonnet | 57 +------------------
1 file changed, 1 insertion(+), 56 deletions(-)
diff --git a/jsonnet/kube-prometheus/platforms/kubespray.libsonnet b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
index 3b35e8e1..dabee251 100644
--- a/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
+++ b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet
@@ -1,56 +1 @@
-local service(name, namespace, labels, selector, ports) = {
- apiVersion: 'v1',
- kind: 'Service',
- metadata: {
- name: name,
- namespace: namespace,
- labels: labels,
- },
- spec: {
- ports+: ports,
- selector: selector,
- clusterIP: 'None',
- },
-};
-
-{
-
- kubernetesControlPlane+: {
- kubeControllerManagerPrometheusDiscoveryService: service(
- 'kube-controller-manager-prometheus-discovery',
- 'kube-system',
- { 'app.kubernetes.io/name': 'kube-controller-manager' },
- { 'app.kubernetes.io/name': 'kube-controller-manager' },
- [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
- ),
-
- kubeSchedulerPrometheusDiscoveryService: service(
- 'kube-scheduler-prometheus-discovery',
- 'kube-system',
- { 'app.kubernetes.io/name': 'kube-scheduler' },
- { 'app.kubernetes.io/name': 'kube-scheduler' },
- [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
- ),
-
- serviceMonitorKubeScheduler+: {
- spec+: {
- selector+: {
- matchLabels: {
- 'app.kubernetes.io/name': 'kube-scheduler',
- },
- },
- },
- },
-
- serviceMonitorKubeControllerManager+: {
- spec+: {
- selector+: {
- matchLabels: {
- 'app.kubernetes.io/name': 'kube-controller-manager',
- },
- },
- },
- },
-
- },
-}
+(import './kubeadm.libsonnet')
--
GitLab