From dc7da46d2c5938ae2891b38a51df5b0f24822c8a Mon Sep 17 00:00:00 2001 From: Domenico Francesco Bruscino Date: Wed, 8 Feb 2023 18:06:30 +0100 Subject: [PATCH] Add custom metadata annotations --- Makefile | 2 ++ bundle.Dockerfile | 5 +++++ bundle/metadata/annotations.yaml | 5 +++++ config/metadata/activemq-artemis-operator.annotations.yaml | 5 +++++ 4 files changed, 17 insertions(+) create mode 100644 config/metadata/activemq-artemis-operator.annotations.yaml diff --git a/Makefile b/Makefile index 7614d2b79..2b11ca6bd 100644 --- a/Makefile +++ b/Makefile @@ -208,6 +208,8 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --package $(OPERATOR_NAMESPACE) --version $(VERSION) $(BUNDLE_METADATA_OPTS) sed -i '/creationTimestamp/d' ./bundle/manifests/*.yaml + sed 's/annotations://' config/metadata/$(OPERATOR_NAMESPACE).annotations.yaml >> bundle/metadata/annotations.yaml + sed -e 's/annotations://' -e 's/ /LABEL /g' -e 's/: /=/g' config/metadata/$(OPERATOR_NAMESPACE).annotations.yaml >> bundle.Dockerfile operator-sdk bundle validate ./bundle .PHONY: bundle-clean diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 2a218a51f..fd27681cf 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -19,3 +19,8 @@ LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ COPY bundle/tests/scorecard /tests/scorecard/ + +LABEL name="artemiscloud/activemq-artemis-operator-bundle" +LABEL description="ActiveMQ Artemis Broker Operator Bundle" +LABEL maintainer="Roddie Kieley " +LABEL version="1.0.10" diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 4db517405..798b93816 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -13,3 +13,8 @@ annotations: # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 operators.operatorframework.io.test.config.v1: tests/scorecard/ + + name: "artemiscloud/activemq-artemis-operator-bundle" + description: "ActiveMQ Artemis Broker Operator Bundle" + maintainer: "Roddie Kieley " + version: "1.0.10" diff --git a/config/metadata/activemq-artemis-operator.annotations.yaml b/config/metadata/activemq-artemis-operator.annotations.yaml new file mode 100644 index 000000000..cdeae099e --- /dev/null +++ b/config/metadata/activemq-artemis-operator.annotations.yaml @@ -0,0 +1,5 @@ +annotations: + name: "artemiscloud/activemq-artemis-operator-bundle" + description: "ActiveMQ Artemis Broker Operator Bundle" + maintainer: "Roddie Kieley " + version: "1.0.10"