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

LOG-5108: Add 5.9.0 container image to must-gather annotation #2436

Closed
wants to merge 1 commit into from
Closed

LOG-5108: Add 5.9.0 container image to must-gather annotation #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion bundle/manifests/clusterlogging.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ metadata:
certified: "false"
console.openshift.io/plugins: '["logging-view-plugin"]'
containerImage: quay.io/openshift-logging/cluster-logging-operator:latest
createdAt: "2024-01-09T03:03:58Z"
createdAt: "2024-04-18T15:39:46Z"
description: The Red Hat OpenShift Logging Operator for OCP provides a means for
configuring and managing your aggregated logging stack.
features.operators.openshift.io/cnf: "false"
Expand All @@ -135,6 +135,7 @@ metadata:
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-logging
operators.openshift.io/infrastructure-features: '["disconnected","proxy-aware"]'
operators.openshift.io/must-gather-image: registry.redhat.io/openshift-logging/cluster-logging-rhel9-operator@sha256:b3a09d6dfc5109cd5d3ebf24201f9d0549d77f8965907c1b6b15faba15c767eb
Copy link
Contributor

Choose a reason for hiding this comment

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

This is an upstream repo and this should point to the upstream image. Given this annotation is meaningless (I think) to the upstream version of the bundle, I would propose simply fixing it in productization scripts and forgo making any change here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will look at incorporating this into midstream.

operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
Container Platform", "OpenShift Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down
3 changes: 2 additions & 1 deletion config/manifests/bases/clusterlogging.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ metadata:
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-logging
operators.openshift.io/infrastructure-features: '["disconnected","proxy-aware"]'
operators.openshift.io/must-gather-image: registry.redhat.io/openshift-logging/cluster-logging-rhel9-operator@sha256:b3a09d6dfc5109cd5d3ebf24201f9d0549d77f8965907c1b6b15faba15c767eb
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
Container Platform", "OpenShift Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-unknown
Expand All @@ -34,7 +35,7 @@ metadata:
operatorframework.io/arch.arm64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: clusterlogging.v0.0.0
name: clusterlogging.v5.9.0
namespace: openshift-logging
spec:
apiservicedefinitions: {}
Expand Down