From 37a0e2b5a6cd5c6d3c7ff7f69bcb84a25cad8e7f Mon Sep 17 00:00:00 2001
From: Cory O'Daniel <cory@coryodaniel.com>
Date: Tue, 26 Mar 2019 11:44:37 -0700
Subject: [PATCH] running gen in docker
---
README.md | 1 +
docs/developing-prometheus-rules-and-grafana-dashboards.md | 1 +
examples/kustomize.jsonnet | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index bc320b79..115fbbbf 100644
--- a/README.md
+++ b/README.md
@@ -165,6 +165,7 @@ local kp =
{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
{ ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) }
+
```
And here's the [build.sh](build.sh) script (which uses `vendor/` to render all manifests in a json structure of `{filename: manifest-content}`):
diff --git a/docs/developing-prometheus-rules-and-grafana-dashboards.md b/docs/developing-prometheus-rules-and-grafana-dashboards.md
index 671a8987..17838b82 100644
--- a/docs/developing-prometheus-rules-and-grafana-dashboards.md
+++ b/docs/developing-prometheus-rules-and-grafana-dashboards.md
@@ -25,6 +25,7 @@ local kp =
{ ['prometheus-' + name]: kp.prometheus[name] for name in std.objectFields(kp.prometheus) } +
{ ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) }
+
```
## Prometheus rules
diff --git a/examples/kustomize.jsonnet b/examples/kustomize.jsonnet
index e1cf7a27..1b6b9038 100644
--- a/examples/kustomize.jsonnet
+++ b/examples/kustomize.jsonnet
@@ -15,14 +15,14 @@ local manifests =
{ ['prometheus-adapter-' + name]: kp.prometheusAdapter[name] for name in std.objectFields(kp.prometheusAdapter) } +
{ ['grafana-' + name]: kp.grafana[name] for name in std.objectFields(kp.grafana) };
-local kustomizationResourceFile(name) = "./manifests/" + name + ".yaml";
+local kustomizationResourceFile(name) = './manifests/' + name + '.yaml';
local kustomization = {
apiVersion: 'kustomize.config.k8s.io/v1beta1',
kind: 'Kustomization',
- resources: std.map(kustomizationResourceFile, std.objectFields(manifests))
+ resources: std.map(kustomizationResourceFile, std.objectFields(manifests)),
};
manifests {
- "../kustomization": kustomization,
+ '../kustomization': kustomization,
}
--
GitLab