Skip to content

fix: remove default value for logging as it affects other plugins #775

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
May 30, 2025
Merged

fix: remove default value for logging as it affects other plugins #775

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
2 changes: 1 addition & 1 deletion bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
categories: Monitoring
certified: "false"
containerImage: observability-operator:1.2.0
createdAt: "2025-05-30T10:17:28Z"
createdAt: "2025-05-30T13:08:57Z"
description: A Go based Kubernetes operator to setup and manage highly available
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
operatorframework.io/cluster-monitoring: "true"
Expand Down
3 changes: 1 addition & 2 deletions bundle/manifests/observability.openshift.io_uiplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,10 @@ spec:
type: object
x-kubernetes-map-type: atomic
schema:
default: viaq
description: |-
Schema is the schema to use for logs querying and display.

Defatults to "viaq" if not specified.
Defatults to "viaq" if not specified, "select" is used to allow users to select the schema from the UI.
enum:
- viaq
- otel
Expand Down
3 changes: 1 addition & 2 deletions deploy/crds/common/observability.openshift.io_uiplugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,10 @@ spec:
type: object
x-kubernetes-map-type: atomic
schema:
default: viaq
description: |-
Schema is the schema to use for logs querying and display.

Defatults to "viaq" if not specified.
Defatults to "viaq" if not specified, "select" is used to allow users to select the schema from the UI.
enum:
- viaq
- otel
Expand Down
3 changes: 1 addition & 2 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4340,10 +4340,9 @@ It always references a LokiStack in the "openshift-logging" namespace.<br/>
<td>
Schema is the schema to use for logs querying and display.

Defatults to "viaq" if not specified.<br/>
Defatults to "viaq" if not specified, "select" is used to allow users to select the schema from the UI.<br/>
<br/>
<i>Enum</i>: viaq, otel, select<br/>
<i>Default</i>: viaq<br/>
</td>
<td>false</td>
</tr><tr>
Expand Down
3 changes: 1 addition & 2 deletions pkg/apis/uiplugin/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,11 @@ type LoggingConfig struct {

// Schema is the schema to use for logs querying and display.
//
// Defatults to "viaq" if not specified.
// Defatults to "viaq" if not specified, "select" is used to allow users to select the schema from the UI.
//
// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="OCP Console Logs Schema",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:ocpConsoleLogsSchema"}
// +kubebuilder:validation:Optional
// +kubebuilder:validation:Enum=viaq;otel;select
// +kubebuilder:default=viaq
Schema string `json:"schema,omitempty"`
}

Expand Down
Loading