From 3238ba257ada3116c0784ba299e1c9d2ff2c4103 Mon Sep 17 00:00:00 2001
From: eedugon <edu.gherran@gmail.com>
Date: Wed, 31 May 2017 20:55:56 +0200
Subject: [PATCH] small changes in k8s/minikube and example-app (#392)
* namespace has to be kube-system
In order for this service to be discovered by ServiceMonitor k8s-apps-http, it should belong to namespace kube-system.
* namespace has to be kube-system
* namespace has to be kube-system
for service discovery to work within prometheus configuration (ServiceMonitor k8s-app) these service and endpoints should belong to kube-system namespace. Otherwise the service monitor won't fetch it.
* selector was incorrect
selector prometheus: prometheus-frontend is incorrect, the name of the Prometheus resource in the example is "frontend", not "prometheus-frontend"
---
manifests/examples/example-app/prometheus-frontend-svc.yaml | 2 +-
manifests/k8s/minikube/kube-controller-manager.yaml | 2 ++
manifests/k8s/minikube/kube-scheduler.yaml | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/manifests/examples/example-app/prometheus-frontend-svc.yaml b/manifests/examples/example-app/prometheus-frontend-svc.yaml
index 9b8ecbb4..6a269155 100644
--- a/manifests/examples/example-app/prometheus-frontend-svc.yaml
+++ b/manifests/examples/example-app/prometheus-frontend-svc.yaml
@@ -11,4 +11,4 @@ spec:
protocol: TCP
targetPort: web
selector:
- prometheus: prometheus-frontend
+ prometheus: frontend
diff --git a/manifests/k8s/minikube/kube-controller-manager.yaml b/manifests/k8s/minikube/kube-controller-manager.yaml
index 135dd24c..d33015aa 100644
--- a/manifests/k8s/minikube/kube-controller-manager.yaml
+++ b/manifests/k8s/minikube/kube-controller-manager.yaml
@@ -1,6 +1,7 @@
apiVersion: v1
kind: Service
metadata:
+ namespace: kube-system
name: kube-controller-manager-prometheus-discovery
labels:
k8s-app: kube-controller-manager
@@ -16,6 +17,7 @@ spec:
apiVersion: v1
kind: Endpoints
metadata:
+ namespace: kube-system
name: kube-controller-manager-prometheus-discovery
labels:
k8s-app: kube-controller-manager
diff --git a/manifests/k8s/minikube/kube-scheduler.yaml b/manifests/k8s/minikube/kube-scheduler.yaml
index b3b51f38..8599575c 100644
--- a/manifests/k8s/minikube/kube-scheduler.yaml
+++ b/manifests/k8s/minikube/kube-scheduler.yaml
@@ -1,6 +1,7 @@
apiVersion: v1
kind: Service
metadata:
+ namespace: kube-system
name: kube-scheduler-prometheus-discovery
labels:
k8s-app: kube-scheduler
@@ -16,6 +17,7 @@ spec:
apiVersion: v1
kind: Endpoints
metadata:
+ namespace: kube-system
name: kube-scheduler-prometheus-discovery
labels:
k8s-app: kube-scheduler
--
GitLab