jsonnet: do not relative jb import paths and move imports to the top of the file

This commit is contained in:
paulfantom
2020-09-18 15:28:11 +02:00
parent 5fe45c57b6
commit bb4b7019a7
2 changed files with 11 additions and 7 deletions

View File

@@ -1,6 +1,7 @@
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 configMapList = k3.core.v1.configMapList;
local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet';
(import 'github.com/brancz/kubernetes-grafana/grafana/grafana.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+:: {
kubeRbacProxy: {
local cfg = self,