Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enhancement: include operator version in CRD annotations #6050

Merged
merged 3 commits into from
Oct 31, 2023
Merged

enhancement: include operator version in CRD annotations #6050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5290178
*: include operator version in CRD annotations
paulfantom Jan 14, 2022
af7309b
example,jsonnet: regenerate
paulfantom Jan 14, 2022
12e5570
fixup! example,jsonnet: regenerate
rexagod Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions bundle.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion example/alertmanager-crd-conversion/patch.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_probes.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/alertmanagerconfigs-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/alertmanagers-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/podmonitors-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/probes-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/prometheusagents-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/prometheuses-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/prometheusrules-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/scrapeconfigs-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/servicemonitors-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion jsonnet/prometheus-operator/thanosrulers-crd.json
View file
Open in desktop
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions scripts/generate/append-operator-version.sh
View file
Open in desktop
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

if [[ "$OSTYPE" == "darwin"* ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest use the label as we have on the managed resources: operator.prometheus.io
WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, makes sense! 👍🏼

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