jsonnet: factor absolute import paths

openshift · Sep 18, 2020 · 3cea4c2 · 3cea4c2
1 parent 3e741d1
commit 3cea4c2
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 20 deletions.
diff --git a/jsonnet/alertmanager.jsonnet b/jsonnet/alertmanager.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local serviceAccount = k.core.v1.serviceAccount;
 local service = k.core.v1.service;
 local servicePort = k.core.v1.service.mixin.spec.portsType;

diff --git a/jsonnet/cluster-monitoring-operator.jsonnet b/jsonnet/cluster-monitoring-operator.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
 local secret = k.core.v1.secret;
 local metrics = import 'telemeter-client/metrics.jsonnet';
 

diff --git a/jsonnet/grafana.jsonnet b/jsonnet/grafana.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local serviceAccount = k.core.v1.serviceAccount;
 local service = k.core.v1.service;
 local servicePort = k.core.v1.service.mixin.spec.portsType;

diff --git a/jsonnet/kube-state-metrics.jsonnet b/jsonnet/kube-state-metrics.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local service = k.core.v1.service;
 local deployment = k.apps.v1beta2.deployment;
 local container = deployment.mixin.spec.template.spec.containersType;

diff --git a/jsonnet/main.jsonnet b/jsonnet/main.jsonnet
@@ -1,11 +1,11 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local configmap = k.core.v1.configMap;
 local removeLimits = (import 'remove-limits.libsonnet').removeLimits;
-local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
-           (import 'kube-prometheus/kube-prometheus-anti-affinity.libsonnet') +
-           (import 'kube-prometheus/kube-prometheus-static-etcd.libsonnet') +
-           (import 'kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet') +
-           (import 'openshift-state-metrics/openshift-state-metrics.libsonnet') +
+local kp = (import 'github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus.libsonnet') +
+           (import 'github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus-anti-affinity.libsonnet') +
+           (import 'github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet') +
+           (import 'github.com/coreos/kube-prometheus/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet') +
+           (import 'github.com/openshift/openshift-state-metrics/jsonnet/openshift-state-metrics.libsonnet') +
            {
              prometheusK8s+:: $.prometheus {
                // Openshift 4.0 clusters already have an etcd service and endpoints.
@@ -62,7 +62,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
                  ),
              },
            } +
-           (import 'telemeter-client/client.libsonnet') +
+           (import 'github.com/openshift/telemeter/jsonnet/telemeter/client.libsonnet') +
            {
 
              _config+:: {

diff --git a/jsonnet/node-exporter.jsonnet b/jsonnet/node-exporter.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local service = k.core.v1.service;
 local daemonset = k.apps.v1beta2.daemonSet;
 local container = daemonset.mixin.spec.template.spec.containersType;

diff --git a/jsonnet/prometheus-adapter.jsonnet b/jsonnet/prometheus-adapter.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local service = k.core.v1.service;
 local deployment = k.apps.v1beta2.deployment;
 local container = deployment.mixin.spec.template.spec.containersType;

diff --git a/jsonnet/prometheus-operator-user-workload.jsonnet b/jsonnet/prometheus-operator-user-workload.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local service = k.core.v1.service;
 local deployment = k.apps.v1beta2.deployment;
 local container = deployment.mixin.spec.template.spec.containersType;

diff --git a/jsonnet/prometheus-operator.jsonnet b/jsonnet/prometheus-operator.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local service = k.core.v1.service;
 local deployment = k.apps.v1beta2.deployment;
 local container = deployment.mixin.spec.template.spec.containersType;

diff --git a/jsonnet/prometheus-user-workload.jsonnet b/jsonnet/prometheus-user-workload.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.3/k.libsonnet';
 local serviceAccount = k.core.v1.serviceAccount;
 local service = k.core.v1.service;
 local servicePort = k.core.v1.service.mixin.spec.portsType;

diff --git a/jsonnet/prometheus.jsonnet b/jsonnet/prometheus.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet/ksonnet.beta.3/k.libsonnet';
 local serviceAccount = k.core.v1.serviceAccount;
 local service = k.core.v1.service;
 local servicePort = k.core.v1.service.mixin.spec.portsType;

diff --git a/jsonnet/remove-runbook.libsonnet b/jsonnet/remove-runbook.libsonnet
@@ -1,4 +1,4 @@
-local utils = import 'kubernetes-mixin/lib/utils.libsonnet';
+local utils = import 'github.com/kubernetes-monitoring/kubernetes-mixin/lib/utils.libsonnet';
 
 {
   prometheusAlerts+::

diff --git a/jsonnet/thanos-querier.jsonnet b/jsonnet/thanos-querier.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
 local secret = k.core.v1.secret;
 local service = k.core.v1.service;
 local ports = service.mixin.spec.portsType;

diff --git a/jsonnet/thanos-ruler.jsonnet b/jsonnet/thanos-ruler.jsonnet
@@ -1,4 +1,4 @@
-local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
+local k = import 'github.com/ksonnet/ksonnet-lib/ksonnet.beta.4/k.libsonnet';
 local secret = k.core.v1.secret;
 local service = k.core.v1.service;
 local ports = service.mixin.spec.portsType;