Skip to content

[release-6.1]LOG-8093:Add missing annotation: operators.openshift.io/must-gather-image #3156

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

Merged
merged 1 commit into from
Nov 20, 2025
+9 −29
Merged

[release-6.1]LOG-8093:Add missing annotation: operators.openshift.io/must-gather-image #3156

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions bundle/manifests/cluster-logging.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ metadata:
categories: OpenShift Optional, Logging & Tracing
certified: "false"
containerImage: quay.io/openshift-logging/cluster-logging-operator:latest
createdAt: "2025-05-14T12:38:55Z"
createdAt: "2025-11-13T10:47:02Z"
description: The Red Hat OpenShift Logging Operator for OCP provides a means for
configuring and managing log collection and forwarding.
features.operators.openshift.io/cnf: "false"
Expand All @@ -107,6 +107,7 @@ metadata:
}
operatorframework.io/suggested-namespace: openshift-logging
operators.openshift.io/infrastructure-features: '["disconnected","proxy-aware"]'
operators.openshift.io/must-gather-image: quay.io/openshift-logging/cluster-logging-operator:latest
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
Container Platform", "OpenShift Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -1724,14 +1725,7 @@ spec:
path: outputs[0].syslog.procId
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:text
- description: |-
The RFC to which the generated messages conform to.


Supported values are:
1. RFC3164
2. RFC5424
displayName: Syslog RFC
- displayName: Syslog RFC
path: outputs[0].syslog.rfc
- description: |-
Severity to set on outgoing syslog records.
Expand Down
8 changes: 2 additions & 6 deletions bundle/manifests/observability.openshift.io_clusterlogforwarders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2426,12 +2426,8 @@ spec:
pattern: ^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$
type: string
rfc:
description: |-
The RFC to which the generated messages conform to.

Supported values are:
1. RFC3164
2. RFC5424
description: SyslogRFCType sets which RFC the generated
messages conform to.
enum:
- RFC3164
- RFC5424
Expand Down
8 changes: 2 additions & 6 deletions config/crd/bases/observability.openshift.io_clusterlogforwarders.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2426,12 +2426,8 @@ spec:
pattern: ^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$
type: string
rfc:
description: |-
The RFC to which the generated messages conform to.

Supported values are:
1. RFC3164
2. RFC5424
description: SyslogRFCType sets which RFC the generated
messages conform to.
enum:
- RFC3164
- RFC5424
Expand Down
10 changes: 2 additions & 8 deletions config/manifests/bases/cluster-logging.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ metadata:
}
operatorframework.io/suggested-namespace: openshift-logging
operators.openshift.io/infrastructure-features: '["disconnected","proxy-aware"]'
operators.openshift.io/must-gather-image: quay.io/openshift-logging/cluster-logging-operator:latest
operators.openshift.io/valid-subscription: '["OpenShift Kubernetes Engine", "OpenShift
Container Platform", "OpenShift Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-unknown
Expand Down Expand Up @@ -1647,14 +1648,7 @@ spec:
path: outputs[0].syslog.procId
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:text
- description: |-
The RFC to which the generated messages conform to.


Supported values are:
1. RFC3164
2. RFC5424
displayName: Syslog RFC
- displayName: Syslog RFC
path: outputs[0].syslog.rfc
- description: |-
Severity to set on outgoing syslog records.
Expand Down