From 1c2122358f1998351bf50a57f1a4db360e11b16f Mon Sep 17 00:00:00 2001 From: Gabriel Bernal Date: Fri, 30 May 2025 14:40:06 +0200 Subject: [PATCH] fix: remove default value for logging as it affects other plugins Signed-off-by: Gabriel Bernal --- .../observability-operator.clusterserviceversion.yaml | 2 +- bundle/manifests/observability.openshift.io_uiplugins.yaml | 3 +-- deploy/crds/common/observability.openshift.io_uiplugins.yaml | 3 +-- docs/api.md | 3 +-- pkg/apis/uiplugin/v1alpha1/types.go | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bundle/manifests/observability-operator.clusterserviceversion.yaml b/bundle/manifests/observability-operator.clusterserviceversion.yaml index 418ab5b6..2aa9daaf 100644 --- a/bundle/manifests/observability-operator.clusterserviceversion.yaml +++ b/bundle/manifests/observability-operator.clusterserviceversion.yaml @@ -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" diff --git a/bundle/manifests/observability.openshift.io_uiplugins.yaml b/bundle/manifests/observability.openshift.io_uiplugins.yaml index 4793f699..a5d66eec 100644 --- a/bundle/manifests/observability.openshift.io_uiplugins.yaml +++ b/bundle/manifests/observability.openshift.io_uiplugins.yaml @@ -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 diff --git a/deploy/crds/common/observability.openshift.io_uiplugins.yaml b/deploy/crds/common/observability.openshift.io_uiplugins.yaml index 95ae6a86..3045d3fd 100644 --- a/deploy/crds/common/observability.openshift.io_uiplugins.yaml +++ b/deploy/crds/common/observability.openshift.io_uiplugins.yaml @@ -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 diff --git a/docs/api.md b/docs/api.md index 7060450a..1f96025f 100644 --- a/docs/api.md +++ b/docs/api.md @@ -4340,10 +4340,9 @@ It always references a LokiStack in the "openshift-logging" namespace.
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, select
- Default: viaq
false diff --git a/pkg/apis/uiplugin/v1alpha1/types.go b/pkg/apis/uiplugin/v1alpha1/types.go index 16d67664..83619b2b 100644 --- a/pkg/apis/uiplugin/v1alpha1/types.go +++ b/pkg/apis/uiplugin/v1alpha1/types.go @@ -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"` }