From af8ac93d527995267383318c284b1e332ef675b6 Mon Sep 17 00:00:00 2001
From: Matthias Loibl <mail@matthiasloibl.com>
Date: Wed, 9 Jan 2019 11:52:16 +0100
Subject: [PATCH] contrib/kube-prometheus: regenerate
---
jsonnetfile.lock.json | 8 ++++----
manifests/grafana-deployment.yaml | 2 ++
manifests/grafana-service.yaml | 4 ++--
manifests/prometheus-adapter-deployment.yaml | 2 ++
manifests/prometheus-service.yaml | 1 +
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index b7150d97..aa834a29 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "d3b2645d2ace03b36ed7d86e5213c09c9e1bde67"
+ "version": "e26f80aca8c9b021245ed3a62bb6c4d23be25786"
},
{
"name": "ksonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "c6932cf90bce4fef218b4308effc9f15c4219a01"
+ "version": "d75c3b260c1077c924d7ea0240250afc235c4cb3"
},
{
"name": "grafana",
@@ -58,7 +58,7 @@
"subdir": "grafana"
}
},
- "version": "3cab96409b2b4b8e8a87f768f1e2b063b1df7038"
+ "version": "9ddf5a198b0f7c898dc061158ea427112acbae11"
},
{
"name": "prometheus-operator",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "b04633fd8e67c65d4fe4929333fb4856f25da189"
+ "version": "1e42503bea073b559fca682219242a801cf4d587"
}
]
}
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index aa5814eb..60ffc3b4 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -69,6 +69,8 @@ spec:
- mountPath: /grafana-dashboard-definitions/0/statefulset
name: grafana-dashboard-statefulset
readOnly: false
+ nodeSelector:
+ beta.kubernetes.io/os: linux
securityContext:
runAsNonRoot: true
runAsUser: 65534
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 09ec1f97..3acdf1e8 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -1,8 +1,8 @@
apiVersion: v1
kind: Service
-labels:
- app: grafana
metadata:
+ labels:
+ app: grafana
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml
index f575fc6c..b0c20198 100644
--- a/manifests/prometheus-adapter-deployment.yaml
+++ b/manifests/prometheus-adapter-deployment.yaml
@@ -39,6 +39,8 @@ spec:
- mountPath: /etc/adapter
name: config
readOnly: false
+ nodeSelector:
+ beta.kubernetes.io/os: linux
serviceAccountName: prometheus-adapter
volumes:
- emptyDir: {}
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 85b007f8..4f61e88a 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -13,3 +13,4 @@ spec:
selector:
app: prometheus
prometheus: k8s
+ sessionAffinity: ClientIP
--
GitLab