mirror of
https://github.com/prometheus-operator/prometheus-operator.git
synced 2025-04-21 03:38:43 +00:00
enhancement: include operator version in CRD annotations (#6050)
* *: include operator version in CRD annotations Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl> * example,jsonnet: regenerate Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl> * fixup! example,jsonnet: regenerate --------- Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl> Co-authored-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl>
This commit is contained in:
parent
63e15b7eb4
commit
ddfea8919b
24 changed files with 51 additions and 11 deletions
Makefilebundle.yaml
example
alertmanager-crd-conversion
prometheus-operator-crd
monitoring.coreos.com_alertmanagerconfigs.yamlmonitoring.coreos.com_alertmanagers.yamlmonitoring.coreos.com_podmonitors.yamlmonitoring.coreos.com_probes.yamlmonitoring.coreos.com_prometheusagents.yamlmonitoring.coreos.com_prometheuses.yamlmonitoring.coreos.com_prometheusrules.yamlmonitoring.coreos.com_scrapeconfigs.yamlmonitoring.coreos.com_servicemonitors.yamlmonitoring.coreos.com_thanosrulers.yaml
jsonnet/prometheus-operator
alertmanagerconfigs-crd.jsonalertmanagers-crd.jsonpodmonitors-crd.jsonprobes-crd.jsonprometheusagents-crd.jsonprometheuses-crd.jsonprometheusrules-crd.jsonscrapeconfigs-crd.jsonservicemonitors-crd.jsonthanosrulers-crd.json
scripts/generate
1
Makefile
1
Makefile
|
@ -224,6 +224,7 @@ generate: k8s-gen generate-crds bundle.yaml example/mixin/alerts.yaml example/th
|
|||
.PHONY: generate-crds
|
||||
generate-crds: $(CONTROLLER_GEN_BINARY) $(GOJSONTOYAML_BINARY) $(TYPES_V1_TARGET) $(TYPES_V1ALPHA1_TARGET) $(TYPES_V1BETA1_TARGET)
|
||||
cd pkg/apis/monitoring && $(CONTROLLER_GEN_BINARY) crd:crdVersions=v1 paths=./v1/. paths=./v1alpha1/. output:crd:dir=$(PWD)/example/prometheus-operator-crd/
|
||||
VERSION=$(VERSION) ./scripts/generate/append-operator-version.sh
|
||||
find example/prometheus-operator-crd/ -name '*.yaml' -print0 | xargs -0 -I{} sh -c '$(GOJSONTOYAML_BINARY) -yamltojson < "$$1" | jq > "$(PWD)/jsonnet/prometheus-operator/$$(basename $$1 | cut -d'_' -f2 | cut -d. -f1)-crd.json"' -- {}
|
||||
cd pkg/apis/monitoring && $(CONTROLLER_GEN_BINARY) crd:crdVersions=v1 paths=./... output:crd:dir=$(PWD)/example/prometheus-operator-crd-full
|
||||
echo "// Code generated using 'make generate-crds'. DO NOT EDIT." > $(PWD)/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet
|
||||
|
|
10
bundle.yaml
generated
10
bundle.yaml
generated
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: alertmanagerconfigs.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -5672,6 +5673,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: alertmanagers.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -13083,6 +13085,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: podmonitors.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -13774,6 +13777,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: probes.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -14507,6 +14511,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: prometheusagents.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -22939,6 +22944,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: prometheuses.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -32770,6 +32776,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: prometheusrules.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -32901,6 +32908,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: scrapeconfigs.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -34170,6 +34178,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: servicemonitors.monitoring.coreos.com
|
||||
spec:
|
||||
|
@ -34891,6 +34900,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: thanosrulers.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "alertmanagerconfigs.monitoring.coreos.com"
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: alertmanagerconfigs.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: alertmanagers.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: podmonitors.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: probes.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: prometheusagents.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: prometheuses.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: prometheusrules.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: scrapeconfigs.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: servicemonitors.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -4,6 +4,7 @@ kind: CustomResourceDefinition
|
|||
metadata:
|
||||
annotations:
|
||||
controller-gen.kubebuilder.io/version: v0.11.1
|
||||
operator.prometheus.io/version: 0.68.0
|
||||
creationTimestamp: null
|
||||
name: thanosrulers.monitoring.coreos.com
|
||||
spec:
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "alertmanagerconfigs.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "alertmanagers.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "podmonitors.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "probes.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "prometheusagents.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "prometheuses.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "prometheusrules.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "scrapeconfigs.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "servicemonitors.monitoring.coreos.com"
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
"kind": "CustomResourceDefinition",
|
||||
"metadata": {
|
||||
"annotations": {
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1"
|
||||
"controller-gen.kubebuilder.io/version": "v0.11.1",
|
||||
"operator.prometheus.io/version": "0.68.0"
|
||||
},
|
||||
"creationTimestamp": null,
|
||||
"name": "thanosrulers.monitoring.coreos.com"
|
||||
|
|
8
scripts/generate/append-operator-version.sh
Executable file
8
scripts/generate/append-operator-version.sh
Executable file
|
@ -0,0 +1,8 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if [[ "$OSTYPE" == "darwin"* ]]; then
|
||||
find example/prometheus-operator-crd/ -name '*.yaml' -exec sed -i '' -e "/^ controller-gen.kubebuilder.io.version.*/a\\
|
||||
operator.prometheus.io/version: $VERSION" {} +
|
||||
else
|
||||
find example/prometheus-operator-crd/ -name '*.yaml' -exec sed -i "/^ controller-gen.kubebuilder.io.version.*/a\\ operator.prometheus.io/version: $VERSION" {} +
|
||||
fi
|
Loading…
Add table
Add a link
Reference in a new issue