diff --git a/Makefile b/Makefile index cad4e19f8..3c5766f51 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ docs: embedmd po-docgen $(GOPATH)/bin/po-docgen compatibility > Documentation/compatibility.md generate: jsonnet-docker - docker run --rm -u=$(shell id -u $(USER)):$(shell id -g $(USER)) -v `pwd`:/go/src/github.com/coreos/prometheus-operator po-jsonnet make generate-deepcopy generate-openapi jsonnet generate-bundle docs generate-kube-prometheus generate-crd + docker run --rm -u=$(shell id -u $(USER)):$(shell id -g $(USER)) -v `pwd`:/go/src/github.com/coreos/prometheus-operator po-jsonnet make generate-deepcopy generate-openapi jsonnet generate-bundle generate-kube-prometheus docs generate-crd $(GOBIN)/openapi-gen: @@ -99,6 +99,10 @@ generate-bundle: hack/generate-bundle.sh generate-kube-prometheus: + # Update the Prometheus Operator version in kube-prometheus + sed -i \ + "s/local version = \".*\";/local version = \"v$(shell cat VERSION)\";/" \ + contrib/kube-prometheus/jsonnet/prometheus-operator/prometheus-operator-deployment.libsonnet; cd contrib/kube-prometheus; $(MAKE) generate-raw jsonnet: diff --git a/contrib/kube-prometheus/jsonnet/prometheus-operator/prometheus-operator-deployment.libsonnet b/contrib/kube-prometheus/jsonnet/prometheus-operator/prometheus-operator-deployment.libsonnet index 0212bc966..35eaa6748 100644 --- a/contrib/kube-prometheus/jsonnet/prometheus-operator/prometheus-operator-deployment.libsonnet +++ b/contrib/kube-prometheus/jsonnet/prometheus-operator/prometheus-operator-deployment.libsonnet @@ -1,8 +1,6 @@ local k = import "ksonnet.beta.3/k.libsonnet"; -local rawVersion = importstr "../../../../VERSION"; -local removeLineBreaks = function(str) std.join("", std.filter(function(c) c != "\n", std.stringChars(str))); -local version = "v0.18.1";//removeLineBreaks(rawVersion); +local version = "v0.18.1"; local deployment = k.apps.v1beta2.deployment; local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType;