From 76cff59b0c0640da29c56d5ae91eae5fe843ae5b Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Fri, 4 Aug 2023 16:43:31 +0200 Subject: [PATCH] Align management state constant with other constants (#1988) * Align management state constant with other constants Signed-off-by: Pavol Loffay * Fix Signed-off-by: Pavol Loffay * Fix Signed-off-by: Pavol Loffay * Fix Signed-off-by: Pavol Loffay --------- Signed-off-by: Pavol Loffay --- apis/v1alpha1/opentelemetrycollector_types.go | 8 ++++---- .../opentelemetry-operator.clusterserviceversion.yaml | 2 +- .../opentelemetry.io_opentelemetrycollectors.yaml | 6 +++--- .../bases/opentelemetry.io_opentelemetrycollectors.yaml | 6 +++--- docs/api.md | 4 ++-- .../e2e/managed-reconcile/01-disable-reconciliation.yaml | 4 ++-- tests/e2e/managed-reconcile/02-enable-reconciliation.yaml | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go index 2d599eb675..a4f9869b4d 100644 --- a/apis/v1alpha1/opentelemetrycollector_types.go +++ b/apis/v1alpha1/opentelemetrycollector_types.go @@ -23,17 +23,17 @@ import ( // ManagementStateType defines the type for CR management states. // -// +kubebuilder:validation:Enum=Managed;Unmanaged +// +kubebuilder:validation:Enum=managed;unmanaged type ManagementStateType string const ( // ManagementStateManaged when the OpenTelemetryCollector custom resource should be // reconciled by the operator. - ManagementStateManaged ManagementStateType = "Managed" + ManagementStateManaged ManagementStateType = "managed" // ManagementStateUnmanaged when the OpenTelemetryCollector custom resource should not be // reconciled by the operator. - ManagementStateUnmanaged ManagementStateType = "Unmanaged" + ManagementStateUnmanaged ManagementStateType = "unmanaged" ) // Ingress is used to specify how OpenTelemetry Collector is exposed. This @@ -89,7 +89,7 @@ type OpenTelemetryCollectorSpec struct { // // +required // +kubebuilder:validation:Required - // +kubebuilder:default:=Managed + // +kubebuilder:default:=managed ManagementState ManagementStateType `json:"managementState,omitempty"` // Resources to set on the OpenTelemetry Collector pods. // +optional diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index e402c3d1cc..7131706fec 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -31,7 +31,7 @@ metadata: categories: Logging & Tracing certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2023-07-05T18:15:51Z" + createdAt: "2023-08-04T13:28:05Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml index 6357ffd4dc..d0401c562a 100644 --- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml +++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml @@ -2926,12 +2926,12 @@ spec: type: integer type: object managementState: - default: Managed + default: managed description: ManagementState defines if the CR should be managed by the operator or not. Default is managed. enum: - - Managed - - Unmanaged + - managed + - unmanaged type: string maxReplicas: description: 'MaxReplicas sets an upper bound to the autoscaling feature. diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml index f1a732b9e9..04d9bdc2ce 100644 --- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml +++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml @@ -2923,12 +2923,12 @@ spec: type: integer type: object managementState: - default: Managed + default: managed description: ManagementState defines if the CR should be managed by the operator or not. Default is managed. enum: - - Managed - - Unmanaged + - managed + - unmanaged type: string maxReplicas: description: 'MaxReplicas sets an upper bound to the autoscaling feature. diff --git a/docs/api.md b/docs/api.md index 9a0fe3bbfa..12cddde7a1 100644 --- a/docs/api.md +++ b/docs/api.md @@ -3708,8 +3708,8 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector. ManagementState defines if the CR should be managed by the operator or not. Default is managed.

- Enum: Managed, Unmanaged
- Default: Managed
+ Enum: managed, unmanaged
+ Default: managed
false diff --git a/tests/e2e/managed-reconcile/01-disable-reconciliation.yaml b/tests/e2e/managed-reconcile/01-disable-reconciliation.yaml index ea52b88497..7e1644c368 100644 --- a/tests/e2e/managed-reconcile/01-disable-reconciliation.yaml +++ b/tests/e2e/managed-reconcile/01-disable-reconciliation.yaml @@ -3,7 +3,7 @@ kind: OpenTelemetryCollector metadata: name: simplest spec: - managementState: Unmanaged + managementState: unmanaged config: | receivers: otlp: @@ -48,4 +48,4 @@ data: traces: receivers: [jaeger, otlp] processors: [] - exporters: [logging] \ No newline at end of file + exporters: [logging] diff --git a/tests/e2e/managed-reconcile/02-enable-reconciliation.yaml b/tests/e2e/managed-reconcile/02-enable-reconciliation.yaml index 688ab25edb..fcd9bc3115 100644 --- a/tests/e2e/managed-reconcile/02-enable-reconciliation.yaml +++ b/tests/e2e/managed-reconcile/02-enable-reconciliation.yaml @@ -3,7 +3,7 @@ kind: OpenTelemetryCollector metadata: name: simplest spec: - managementState: Managed + managementState: managed config: | receivers: otlp: @@ -20,4 +20,4 @@ spec: traces: receivers: [otlp] processors: [] - exporters: [logging] \ No newline at end of file + exporters: [logging]