diff --git a/Makefile b/Makefile index 7f7fa77b9..157e29846 100644 --- a/Makefile +++ b/Makefile @@ -238,6 +238,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada $(OPERATOR_SDK) generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) + ./hack/add-openshift-annotations.sh $(OPERATOR_SDK) bundle validate ./bundle .PHONY: bundle/redhat diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 74f6e2eab..83dcc69fd 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -14,3 +14,4 @@ LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 # Copy files to locations specified by labels. COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ +LABEL com.redhat.openshift.versions="v4.11-v4.15" diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index 1f7769fc5..34da697e3 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -95,12 +95,13 @@ metadata: capabilities: Basic Install categories: Monitoring containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 - createdAt: "2024-01-22T07:16:13Z" + createdAt: "2024-02-03T07:28:20Z" + description: Deploys and manages Grafana instances, dashboards and data sources operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/grafana/grafana-operator support: Grafana Labs - name: grafana-operator.v5.6.0 + name: grafana-operator.v5.6.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -332,7 +333,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.annotations['olm.targetNamespaces'] - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 + image: ghcr.io/grafana/grafana-operator@sha256:49ed7bdbae0b9a43e31df2e8ad2baad07042cf098d3c5944c4ce96e20a296695 imagePullPolicy: Always livenessProbe: httpGet: @@ -415,6 +416,9 @@ spec: links: - name: Grafana Operator url: https://grafana.github.io/grafana-operator + maintainers: + - email: grafana-operator@grafana.com + name: Grafana-operator maintainers maturity: stable minKubeVersion: 1.23.0 provider: @@ -423,9 +427,9 @@ spec: relatedImages: - image: docker.io/grafana/grafana@sha256:ff68ed4324e471ffa269aa5308cdcf12276ef2d5a660daea95db9d629a32a7d8 name: grafana - - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 + - image: ghcr.io/grafana/grafana-operator@sha256:49ed7bdbae0b9a43e31df2e8ad2baad07042cf098d3c5944c4ce96e20a296695 name: manager - image: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752 name: grafana-operator-97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752-annotation - replaces: grafana-operator.v5.5.2 - version: 5.6.0 + replaces: grafana-operator.v5.6.0 + version: 5.6.1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 87ac26496..1aceb1d9c 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -9,3 +9,6 @@ annotations: operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + + # OpenShift specific annotations + com.redhat.openshift.versions: "v4.11-v4.15" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 55eeca4f1..15688959d 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -15,4 +15,4 @@ configMapGenerator: images: - name: controller newName: ghcr.io/grafana/grafana-operator - newTag: v5.6.0 + newTag: v5.6.1 diff --git a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml index fd7fd80dc..5a07268df 100644 --- a/config/manifests/bases/grafana-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/grafana-operator.clusterserviceversion.yaml @@ -7,6 +7,7 @@ metadata: categories: Monitoring containerImage: ghcr.io/grafana/grafana-operator:v5.6.0 createdAt: "2023-12-11T09:21:22Z" + description: Deploys and manages Grafana instances, dashboards and data sources repository: https://github.com/grafana/grafana-operator support: Grafana Labs name: grafana-operator.v0.0.0 @@ -60,10 +61,13 @@ spec: links: - name: Grafana Operator url: https://grafana.github.io/grafana-operator + maintainers: + - email: grafana-operator@grafana.com + name: Grafana-operator maintainers maturity: stable minKubeVersion: 1.23.0 provider: name: Grafana Labs url: https://grafana.com - replaces: grafana-operator.v5.5.2 + replaces: grafana-operator.v5.6.0 version: 0.0.0 diff --git a/hack/add-openshift-annotations.sh b/hack/add-openshift-annotations.sh new file mode 100755 index 000000000..b4ac3ad1b --- /dev/null +++ b/hack/add-openshift-annotations.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +OPENSHIFT_VERSIONS="\"v4.11-v4.15\"" + +{ + echo "" + echo " # OpenShift specific annotations" + echo " com.redhat.openshift.versions: $OPENSHIFT_VERSIONS" +} >> bundle/metadata/annotations.yaml + +echo "LABEL com.redhat.openshift.versions=$OPENSHIFT_VERSIONS" >> bundle.Dockerfile