From c2daa0346c10e215816584619896152d81bdcdbf Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Thu, 13 Apr 2017 16:43:11 +0200
Subject: [PATCH] cut 0.8.1
---
.../prometheus-operator.yaml | 2 +-
.../prometheus-k8s-servicemonitors.yaml | 23 -------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/manifests/prometheus-operator/prometheus-operator.yaml b/manifests/prometheus-operator/prometheus-operator.yaml
index 524dc292..7d11df9b 100644
--- a/manifests/prometheus-operator/prometheus-operator.yaml
+++ b/manifests/prometheus-operator/prometheus-operator.yaml
@@ -14,7 +14,7 @@ spec:
serviceAccountName: prometheus-operator
containers:
- name: prometheus-operator
- image: quay.io/coreos/prometheus-operator:v0.8.0
+ image: quay.io/coreos/prometheus-operator:v0.8.1
args:
- "--kubelet-object=kube-system/kubelet"
- "--config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1"
diff --git a/manifests/prometheus/prometheus-k8s-servicemonitors.yaml b/manifests/prometheus/prometheus-k8s-servicemonitors.yaml
index 110dfa42..8b1f2b4a 100644
--- a/manifests/prometheus/prometheus-k8s-servicemonitors.yaml
+++ b/manifests/prometheus/prometheus-k8s-servicemonitors.yaml
@@ -24,29 +24,6 @@ spec:
---
apiVersion: monitoring.coreos.com/v1alpha1
kind: ServiceMonitor
-metadata:
- name: k8s-apps-https
- labels:
- k8s-apps: https
-spec:
- jobLabel: k8s-app
- selector:
- matchExpressions:
- - {key: k8s-app, operator: Exists}
- namespaceSelector:
- matchNames:
- - kube-system
- endpoints:
- - port: https-metrics
- interval: 15s
- scheme: https
- tlsConfig:
- caFile: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
- insecureSkipVerify: true
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
----
-apiVersion: monitoring.coreos.com/v1alpha1
-kind: ServiceMonitor
metadata:
name: k8s-apps-http
labels:
--
GitLab