Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
kube-prometheus
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
prometheus-operator
kube-prometheus
Commits
bb4b7019
Unverified
Commit
bb4b7019
authored
4 years ago
by
paulfantom
Browse files
Options
Downloads
Patches
Plain Diff
jsonnet: do not relative jb import paths and move imports to the top of the file
parent
5fe45c57
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
jsonnet/kube-prometheus/kube-prometheus.libsonnet
+2
-1
2 additions, 1 deletion
jsonnet/kube-prometheus/kube-prometheus.libsonnet
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+9
-6
9 additions, 6 deletions
...rometheus/kube-state-metrics/kube-state-metrics.libsonnet
with
11 additions
and
7 deletions
jsonnet/kube-prometheus/kube-prometheus.libsonnet
+
2
−
1
View file @
bb4b7019
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;
...
@@ -60,7 +61,7 @@ local configMapList = k3.core.v1.configMapList;
],
],
},
},
}
+
}
+
(
(
import
'kube-prometheus/kube-r
bac
-p
roxy
/c
ontainer
.libsonnet'
)
{
(
kubeR
bac
P
roxy
C
ontainer
{
config
+::
{
config
+::
{
kubeRbacProxy
:
{
kubeRbacProxy
:
{
local
cfg
=
self
,
local
cfg
=
self
,
...
...
This diff is collapsed.
Click to expand it.
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+
9
−
6
View file @
bb4b7019
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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -98,7 +101,7 @@
},
},
},
},
}
+
}
+
(
(
import
'kube-prometheus/kube-r
bac
-p
roxy
/c
ontainer
.libsonnet'
)
{
(
kubeR
bac
P
roxy
C
ontainer
{
config
+::
{
config
+::
{
kubeRbacProxy
:
{
kubeRbacProxy
:
{
local
cfg
=
self
,
local
cfg
=
self
,
...
@@ -112,7 +115,7 @@
...
@@ -112,7 +115,7 @@
},
},
},
},
}).
deploymentMixin
+
}).
deploymentMixin
+
(
(
import
'kube-prometheus/kube-r
bac
-p
roxy
/c
ontainer
.libsonnet'
)
{
(
kubeR
bac
P
roxy
C
ontainer
{
config
+::
{
config
+::
{
kubeRbacProxy
:
{
kubeRbacProxy
:
{
local
cfg
=
self
,
local
cfg
=
self
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment