easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #682 from paulfantom/follow-up-675

Browse Source 
Fixing issues with kube-rbac-proxy when importing kube-prometheus as a library
This commit is contained in:
Matthias Loibl
2020-09-18 16:35:05 +02:00
committed by GitHub
parent 5fe45c57b6 ea109b463d
commit 59d6843d3d
2 changed files with 120 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsonnet/kube-prometheus/kube-prometheus.libsonnet
View File

@@ -1,6 +1,7 @@
local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet'; local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
local k3 = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet'; local k3 = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
local configMapList = k3.core.v1.configMapList; local configMapList = k3.core.v1.configMapList;
local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
(import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') + (import 'github.com/brancz/kubernetes-grafana/grafana/grafana.libsonnet') +
(import './kube-state-metrics/kube-state-metrics.libsonnet') + (import './kube-state-metrics/kube-state-metrics.libsonnet') +
@@ -60,7 +61,7 @@ local configMapList = k3.core.v1.configMapList;
], ],
}, },
} + } +
((import 'kube-prometheus/kube-rbac-proxy/container.libsonnet') { (kubeRbacProxyContainer {
config+:: { config+:: {
kubeRbacProxy: { kubeRbacProxy: {
local cfg = self, local cfg = self,

15
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
View File

@@ -1,3 +1,6 @@
local kubeRbacProxyContainer = import '../kube-rbac-proxy/container.libsonnet';
local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet';
{ {
_config+:: { _config+:: {
versions+:: { versions+:: {
@@ -11,9 +14,9 @@
scrapeTimeout: '30s', scrapeTimeout: '30s',
}, },
}, },
kubeStateMetrics+:: (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-metrics/kube-state-metrics.libsonnet') + kubeStateMetrics+::
{ ksm + {
local ksm = self, local version = self.version,
name:: 'kube-state-metrics', name:: 'kube-state-metrics',
namespace:: $._config.namespace, namespace:: $._config.namespace,
version:: $._config.versions.kubeStateMetrics, version:: $._config.versions.kubeStateMetrics,
@@ -57,7 +60,7 @@
namespace: $._config.namespace, namespace: $._config.namespace,
labels: { labels: {
'app.kubernetes.io/name': 'kube-state-metrics', 'app.kubernetes.io/name': 'kube-state-metrics',
'app.kubernetes.io/version': ksm.version, 'app.kubernetes.io/version': version,
}, },
}, },
spec: { spec: {
@@ -98,7 +101,7 @@
}, },
}, },
} + } +
((import 'kube-prometheus/kube-rbac-proxy/container.libsonnet') { (kubeRbacProxyContainer {
config+:: { config+:: {
kubeRbacProxy: { kubeRbacProxy: {
local cfg = self, local cfg = self,
@@ -112,7 +115,7 @@
}, },
}, },
}).deploymentMixin + }).deploymentMixin +
((import 'kube-prometheus/kube-rbac-proxy/container.libsonnet') { (kubeRbacProxyContainer {
config+:: { config+:: {
kubeRbacProxy: { kubeRbacProxy: {
local cfg = self, local cfg = self,