diff --git a/Makefile b/Makefile index baae1e209b8f8ce375ace1069cd522707f61cd46..60c6d5f39b950db2abbcf2399cb5426be00f2d08 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +JSONNET_FMT := jsonnet fmt -n 2 --max-blank-lines 2 --string-style s --comment-style s + image: docker build -f ../../scripts/jsonnet/Dockerfile -t po-jsonnet ../../ @@ -11,10 +13,14 @@ crdtojsonnet: cat ../../example/prometheus-operator-crd/servicemonitor.crd.yaml | gojsontoyaml -yamltojson > jsonnet/kube-prometheus/prometheus-operator/servicemonitor-crd.libsonnet cat ../../example/prometheus-operator-crd/rulefile.crd.yaml | gojsontoyaml -yamltojson > jsonnet/kube-prometheus/prometheus-operator/rulefile-crd.libsonnet -generate-raw: crdtojsonnet +generate-raw: crdtojsonnet fmt jb install ./build.sh +fmt: + find . -name 'vendor' -prune -o -name '*.libsonnet' -o -name '*.jsonnet' -print | \ + xargs -n 1 -- $(JSONNET_FMT) -i + test: image @echo ">> Compiling assets and generating Kubernetes manifests" docker run --rm -u=$(shell id -u $(USER)):$(shell id -g $(USER)) -v $(shell dirname $(dir $(abspath $(dir $$PWD)))):/go/src/github.com/coreos/prometheus-operator/ --workdir /go/src/github.com/coreos/prometheus-operator/contrib/kube-prometheus po-jsonnet make test-raw @@ -23,4 +29,4 @@ test-raw: crdtojsonnet jb install ./test.sh -.PHONY: image generate crdtojsonnet generate-raw test +.PHONY: image generate crdtojsonnet generate-raw test test-raw fmt diff --git a/README.md b/README.md index d67ea680701e3185e72ed5f238298cc92404d963..cc392e7a807631c7b9784dd955e5b2a857ecb1c7 100644 --- a/README.md +++ b/README.md @@ -151,16 +151,16 @@ kubeadm: [embedmd]:# (examples/jsonnet-snippets/kubeadm.jsonnet) ```jsonnet -(import "kube-prometheus/kube-prometheus.libsonnet") + -(import "kube-prometheus/kube-prometheus-kubeadm.libsonnet") +(import 'kube-prometheus/kube-prometheus.libsonnet') + +(import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') ``` bootkube: [embedmd]:# (examples/jsonnet-snippets/bootkube.jsonnet) ```jsonnet -(import "kube-prometheus/kube-prometheus.libsonnet") + -(import "kube-prometheus/kube-prometheus-bootkube.libsonnet") +(import 'kube-prometheus/kube-prometheus.libsonnet') + +(import 'kube-prometheus/kube-prometheus-bootkube.libsonnet') ``` kops: @@ -175,23 +175,23 @@ Another mixin that may be useful for exploring the stack is to expose the UIs of [embedmd]:# (examples/jsonnet-snippets/node-ports.jsonnet) ```jsonnet -(import "kube-prometheus/kube-prometheus.libsonnet") + -(import "kube-prometheus/kube-prometheus-node-ports.libsonnet") +(import 'kube-prometheus/kube-prometheus.libsonnet') + +(import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') ``` For example the name of the `Prometheus` object provided by this library can be overridden: [embedmd]:# (examples/prometheus-name-override.jsonnet) ```jsonnet -((import "kube-prometheus/kube-prometheus.libsonnet") + { - prometheus+: { - prometheus+: { - metadata+: { - name: "my-name", - } - } - } -}).prometheus.prometheus +((import 'kube-prometheus/kube-prometheus.libsonnet') + { + prometheus+: { + prometheus+: { + metadata+: { + name: 'my-name', + }, + }, + }, + }).prometheus.prometheus ``` Standard Kubernetes manifests are all written using [ksonnet-lib](https://github.com/ksonnet/ksonnet-lib/), so they can be modified with the mixins supplied by ksonnet-lib. For example to override the namespace of the node-exporter DaemonSet: diff --git a/examples/jsonnet-snippets/bootkube.jsonnet b/examples/jsonnet-snippets/bootkube.jsonnet index 89a7eb7b475098171c40ac912e9fac5515321b52..f7386a012ab6e8594d6d833aee3264e5e40caf7d 100644 --- a/examples/jsonnet-snippets/bootkube.jsonnet +++ b/examples/jsonnet-snippets/bootkube.jsonnet @@ -1,2 +1,2 @@ -(import "kube-prometheus/kube-prometheus.libsonnet") + -(import "kube-prometheus/kube-prometheus-bootkube.libsonnet") +(import 'kube-prometheus/kube-prometheus.libsonnet') + +(import 'kube-prometheus/kube-prometheus-bootkube.libsonnet') diff --git a/examples/jsonnet-snippets/kubeadm.jsonnet b/examples/jsonnet-snippets/kubeadm.jsonnet index 591809ebf2215aa4e23f4390f1c0bf81a54bf164..a7837163e4ffe9cae140382eae63dde0d2395321 100644 --- a/examples/jsonnet-snippets/kubeadm.jsonnet +++ b/examples/jsonnet-snippets/kubeadm.jsonnet @@ -1,2 +1,2 @@ -(import "kube-prometheus/kube-prometheus.libsonnet") + -(import "kube-prometheus/kube-prometheus-kubeadm.libsonnet") +(import 'kube-prometheus/kube-prometheus.libsonnet') + +(import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet') diff --git a/examples/jsonnet-snippets/node-ports.jsonnet b/examples/jsonnet-snippets/node-ports.jsonnet index 68731676aa446db96fda83bc528b44a721f2e6c1..c02f1ae729edd7f8fb9df8f39d8a8f2a68c600c7 100644 --- a/examples/jsonnet-snippets/node-ports.jsonnet +++ b/examples/jsonnet-snippets/node-ports.jsonnet @@ -1,2 +1,2 @@ -(import "kube-prometheus/kube-prometheus.libsonnet") + -(import "kube-prometheus/kube-prometheus-node-ports.libsonnet") +(import 'kube-prometheus/kube-prometheus.libsonnet') + +(import 'kube-prometheus/kube-prometheus-node-ports.libsonnet') diff --git a/examples/prometheus-name-override.jsonnet b/examples/prometheus-name-override.jsonnet index d6410fd89c5cfe2ecc6dcb800c14452e8d455f9f..862180129d9f3440ccc158ea07e33bc440b22561 100644 --- a/examples/prometheus-name-override.jsonnet +++ b/examples/prometheus-name-override.jsonnet @@ -1,9 +1,9 @@ -((import "kube-prometheus/kube-prometheus.libsonnet") + { - prometheus+: { - prometheus+: { - metadata+: { - name: "my-name", - } - } - } -}).prometheus.prometheus +((import 'kube-prometheus/kube-prometheus.libsonnet') + { + prometheus+: { + prometheus+: { + metadata+: { + name: 'my-name', + }, + }, + }, + }).prometheus.prometheus