feat: add loglevel

Signed-off-by: Armando Ruocco <[email protected]>

Author: armru

api/v1/objectstore_types.go

@@ -41,8 +41,15 @@ type InstanceSidecarConfiguration struct {
 	// AdditionalContainerArgs is an optional list of command-line arguments
 	// to be passed to the sidecar container when it starts.
 	// The provided arguments are appended to the container’s default arguments.
+	// +kubebuilder:validation:XValidation:rule="self == null || self.all(a, !a.matches('^--log-level($|=.*)'))",reason="FieldValueForbidden",message="use spec.instanceSidecarConfiguration.logLevel instead of --log-level in additionalContainerArgs"
 	// +optional
 	AdditionalContainerArgs []string `json:"additionalContainerArgs,omitempty"`
+
+	// The instances' log level, one of the following values: error, warning, info (default), debug, trace
+	// +kubebuilder:default:=info
+	// +kubebuilder:validation:Enum:=error;warning;info;debug;trace
+	// +optional
+	LogLevel string `json:"logLevel,omitempty"`
 }
 
 // ObjectStoreSpec defines the desired state of ObjectStore.

config/crd/bases/barmancloud.cnpg.io_objectstores.yaml

@@ -399,6 +399,11 @@ spec:
                     items:
                       type: string
                     type: array
+                    x-kubernetes-validations:
+                    - message: use spec.instanceSidecarConfiguration.logLevel instead
+                        of --log-level in additionalContainerArgs
+                      reason: FieldValueForbidden
+                      rule: self == null || self.all(a, !a.matches('^--log-level($|=.*)'))
                   env:
                     description: The environment to be explicitly passed to the sidecar
                     items:
@@ -519,6 +524,17 @@ spec:
                       - name
                       type: object
                     type: array
+                  logLevel:
+                    default: info
+                    description: 'The instances'' log level, one of the following
+                      values: error, warning, info (default), debug, trace'
+                    enum:
+                    - error
+                    - warning
+                    - info
+                    - debug
+                    - trace
+                    type: string
                   resources:
                     description: Resources define cpu/memory requests and limits for
                       the sidecar that runs in the instance pods.

internal/cnpgi/operator/lifecycle.go

@@ -236,6 +236,15 @@ func (impl LifecycleImplementation) collectAdditionalInstanceArgs(
 	ctx context.Context,
 	pluginConfiguration *config.PluginConfiguration,
 ) ([]string, error) {
+	collectTypedAdditionalArgs := func(store *barmancloudv1.ObjectStore) []string {
+		var args []string
+		if len(store.Spec.InstanceSidecarConfiguration.LogLevel) > 0 {
+			args = append(args, "--log-level", store.Spec.InstanceSidecarConfiguration.LogLevel)
+		}
+
+		return args
+	}
+
 	// Prefer the cluster object store (backup/archive). If not set, fallback to the recovery object store.
 	// If neither is configured, no additional args are provided.
 	if len(pluginConfiguration.BarmanObjectName) > 0 {
@@ -244,7 +253,11 @@ func (impl LifecycleImplementation) collectAdditionalInstanceArgs(
 			return nil, fmt.Errorf("while getting barman object store %s: %w",
 				pluginConfiguration.GetBarmanObjectKey().String(), err)
 		}
-		return barmanObjectStore.Spec.InstanceSidecarConfiguration.AdditionalContainerArgs, nil
+		args := append(
+			barmanObjectStore.Spec.InstanceSidecarConfiguration.AdditionalContainerArgs,
+			collectTypedAdditionalArgs(&barmanObjectStore)...,
+		)
+		return args, nil
 	}
 
 	if len(pluginConfiguration.RecoveryBarmanObjectName) > 0 {
@@ -253,7 +266,11 @@ func (impl LifecycleImplementation) collectAdditionalInstanceArgs(
 			return nil, fmt.Errorf("while getting recovery barman object store %s: %w",
 				pluginConfiguration.GetRecoveryBarmanObjectKey().String(), err)
 		}
-		return barmanObjectStore.Spec.InstanceSidecarConfiguration.AdditionalContainerArgs, nil
+		args := append(
+			barmanObjectStore.Spec.InstanceSidecarConfiguration.AdditionalContainerArgs,
+			collectTypedAdditionalArgs(&barmanObjectStore)...,
+		)
+		return args, nil
 	}
 
 	return nil, nil