easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add formatting jsonnet to generate make target

Browse Source
This commit is contained in:
Frederic Branczyk
2018-05-18 12:04:33 +02:00
parent d8f6b6f81b
commit ca057722e5
6 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -1,3 +1,5 @@
JSONNET_FMT := jsonnet fmt -n 2 --max-blank-lines 2 --string-style s --comment-style s
image: image:
docker build -f ../../scripts/jsonnet/Dockerfile -t po-jsonnet ../../ 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/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 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 jb install
./build.sh ./build.sh
fmt:
find . -name 'vendor' -prune -o -name '*.libsonnet' -o -name '*.jsonnet' -print | \
xargs -n 1 -- $(JSONNET_FMT) -i
test: image test: image
@echo ">> Compiling assets and generating Kubernetes manifests" @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 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 jb install
./test.sh ./test.sh
.PHONY: image generate crdtojsonnet generate-raw test .PHONY: image generate crdtojsonnet generate-raw test test-raw fmt

22
README.md
View File

@@ -151,16 +151,16 @@ kubeadm:
[embedmd]:# (examples/jsonnet-snippets/kubeadm.jsonnet) [embedmd]:# (examples/jsonnet-snippets/kubeadm.jsonnet)
```jsonnet ```jsonnet
(import "kube-prometheus/kube-prometheus.libsonnet") + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import "kube-prometheus/kube-prometheus-kubeadm.libsonnet") (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet')
``` ```
bootkube: bootkube:
[embedmd]:# (examples/jsonnet-snippets/bootkube.jsonnet) [embedmd]:# (examples/jsonnet-snippets/bootkube.jsonnet)
```jsonnet ```jsonnet
(import "kube-prometheus/kube-prometheus.libsonnet") + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import "kube-prometheus/kube-prometheus-bootkube.libsonnet") (import 'kube-prometheus/kube-prometheus-bootkube.libsonnet')
``` ```
kops: kops:
@@ -175,22 +175,22 @@ Another mixin that may be useful for exploring the stack is to expose the UIs of
[embedmd]:# (examples/jsonnet-snippets/node-ports.jsonnet) [embedmd]:# (examples/jsonnet-snippets/node-ports.jsonnet)
```jsonnet ```jsonnet
(import "kube-prometheus/kube-prometheus.libsonnet") + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import "kube-prometheus/kube-prometheus-node-ports.libsonnet") (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet')
``` ```
For example the name of the `Prometheus` object provided by this library can be overridden: For example the name of the `Prometheus` object provided by this library can be overridden:
[embedmd]:# (examples/prometheus-name-override.jsonnet) [embedmd]:# (examples/prometheus-name-override.jsonnet)
```jsonnet ```jsonnet
((import "kube-prometheus/kube-prometheus.libsonnet") + { ((import 'kube-prometheus/kube-prometheus.libsonnet') + {
prometheus+: { prometheus+: {
prometheus+: { prometheus+: {
metadata+: { metadata+: {
name: "my-name", name: 'my-name',
} },
} },
} },
}).prometheus.prometheus }).prometheus.prometheus
``` ```

4
examples/jsonnet-snippets/bootkube.jsonnet
View File

@@ -1,2 +1,2 @@
(import "kube-prometheus/kube-prometheus.libsonnet") + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import "kube-prometheus/kube-prometheus-bootkube.libsonnet") (import 'kube-prometheus/kube-prometheus-bootkube.libsonnet')

4
examples/jsonnet-snippets/kubeadm.jsonnet
View File

@@ -1,2 +1,2 @@
(import "kube-prometheus/kube-prometheus.libsonnet") + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import "kube-prometheus/kube-prometheus-kubeadm.libsonnet") (import 'kube-prometheus/kube-prometheus-kubeadm.libsonnet')

4
examples/jsonnet-snippets/node-ports.jsonnet
View File

@@ -1,2 +1,2 @@
(import "kube-prometheus/kube-prometheus.libsonnet") + (import 'kube-prometheus/kube-prometheus.libsonnet') +
(import "kube-prometheus/kube-prometheus-node-ports.libsonnet") (import 'kube-prometheus/kube-prometheus-node-ports.libsonnet')

10
examples/prometheus-name-override.jsonnet
View File

@@ -1,9 +1,9 @@
((import "kube-prometheus/kube-prometheus.libsonnet") + { ((import 'kube-prometheus/kube-prometheus.libsonnet') + {
prometheus+: { prometheus+: {
prometheus+: { prometheus+: {
metadata+: { metadata+: {
name: "my-name", name: 'my-name',
} },
} },
} },
}).prometheus.prometheus }).prometheus.prometheus