From 3d2aa76349471fe528d51939cd669e0446f5db2d Mon Sep 17 00:00:00 2001 From: Gerard Vanloo Date: Mon, 15 Aug 2022 05:29:50 -0400 Subject: [PATCH] Adding valid subscription annotation to metadata (#6907) --- operator/CHANGELOG.md | 1 + .../bundle/manifests/loki-operator.clusterserviceversion.yaml | 2 ++ .../manifests/bases/loki-operator.clusterserviceversion.yaml | 2 ++ 3 files changed, 5 insertions(+) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 7294802fe4..bb7c621bed 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,6 @@ ## Main +- [6907](https://github.com/grafana/loki/pull/6907) **Red-GV**: Adding valid subscription annotation to operator metadata - [6479](https://github.com/grafana/loki/pull/6749) **periklis**: Update Loki operand to v2.6.1 - [6748](https://github.com/grafana/loki/pull/6748) **periklis**: Update go4.org/unsafe/assume-no-moving-gc to latest - [6741](https://github.com/grafana/loki/pull/6741) **aminesnow**: Golang version to 1.18 and k8s client to 1.24 diff --git a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml index 1ac327d591..fbb4bdff83 100644 --- a/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/loki-operator.clusterserviceversion.yaml @@ -162,6 +162,8 @@ metadata: olm.skipRange: '>=5.4.0-0 <5.5.0' operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: openshift-operators-redhat + operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift + Platform Plus"]' operators.operatorframework.io/builder: operator-sdk-unknown operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 support: AOS Cluster Logging diff --git a/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml index fa21dc948f..7715ffb9ba 100644 --- a/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml +++ b/operator/config/manifests/bases/loki-operator.clusterserviceversion.yaml @@ -19,6 +19,8 @@ metadata: olm.skipRange: '>=5.4.0-0 <5.5.0' operatorframework.io/cluster-monitoring: "true" operatorframework.io/suggested-namespace: openshift-operators-redhat + operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift + Platform Plus"]' support: AOS Cluster Logging labels: operatorframework.io/arch.amd64: supported