Merge remote-tracking branch 'origin/main' into feat/experimental-entra-backend

Author: maltesander

CHANGELOG.md

@@ -6,27 +6,31 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Adds new telemetry CLI arguments and environment variables ([#715]).
+  - Use `--file-log-max-files` (or `FILE_LOG_MAX_FILES`) to limit the number of log files kept.
+  - Use `--file-log-rotation-period` (or `FILE_LOG_ROTATION_PERIOD`) to configure the frequency of rotation.
+  - Use `--console-log-format` (or `CONSOLE_LOG_FORMAT`) to set the format to `plain` (default) or `json`.
 - Log the startup event for bundle-builder and user-info-fetcher ([#703]).
 - Support experimental user-info-fetcher Entra backend to fetch user groups ([#712]).
 
 ### Changed
 
-- BREAKING: Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#703], [#710]).
+- BREAKING: Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#703], [#710], [#715]).
   - operator-binary:
-    - The console log level was set by `OPA_OPERATOR_LOG`, and is now set by `CONSOLE_LOG`.
-    - The file log level was set by `OPA_OPERATOR_LOG`, and is now set by `FILE_LOG`.
+    - The console log level was set by `OPA_OPERATOR_LOG`, and is now set by `CONSOLE_LOG_LEVEL`.
+    - The file log level was set by `OPA_OPERATOR_LOG`, and is now set by `FILE_LOG_LEVEL`.
     - The file log directory was set by `OPA_OPERATOR_LOG_DIRECTORY`, and is now set
-      by `ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
+      by `FILE_LOG_DIRECTORY` (or via `--file-log-directory <DIRECTORY>`).
   - bundle-builder:
-    - The console log level was set by `OPA_BUNDLE_BUILDER_LOG`, and is now set by `CONSOLE_LOG`.
-    - The file log level was set by `OPA_BUNDLE_BUILDER_LOG`, and is now set by `FILE_LOG`.
+    - The console log level was set by `OPA_BUNDLE_BUILDER_LOG`, and is now set by `CONSOLE_LOG_LEVEL`.
+    - The file log level was set by `OPA_BUNDLE_BUILDER_LOG`, and is now set by `FILE_LOG_LEVEL`.
     - The file log directory was set by `OPA_BUNDLE_BUILDER_LOG_DIRECTORY`, and is now set
-      by `ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
+      by `FILE_LOG_DIRECTORY` (or via `--file-log-directory <DIRECTORY>`).
   - user-info-fetcher:
-    - The console log level was set by `OPA_OPERATOR_LOG`, and is now set by `CONSOLE_LOG`.
-    - The file log level was set by `OPA_OPERATOR_LOG`, and is now set by `FILE_LOG`.
+    - The console log level was set by `OPA_OPERATOR_LOG`, and is now set by `CONSOLE_LOG_LEVEL`.
+    - The file log level was set by `OPA_OPERATOR_LOG`, and is now set by `FILE_LOG_LEVEL`.
     - The file log directory was set by `OPA_OPERATOR_LOG_DIRECTORY`, and is now set
-      by `ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
+      by `FILE_LOG_DIRECTORY` (or via `--file-log-directory <DIRECTORY>`).
   - Replace stackable-operator `print_startup_string` with `tracing::info!` with fields.
 - BREAKING: Inject the vector aggregator address into the vector config using the env var `VECTOR_AGGREGATOR_ADDRESS` instead
     of having the operator write it to the vector config ([#707]).
@@ -40,6 +44,7 @@ All notable changes to this project will be documented in this file.
 [#709]: https://github.com/stackabletech/opa-operator/pull/709
 [#710]: https://github.com/stackabletech/opa-operator/pull/710
 [#712]: https://github.com/stackabletech/opa-operator/pull/712
+[#715]: https://github.com/stackabletech/opa-operator/pull/715
 
 ## [25.3.0] - 2025-03-21
 

Cargo.lock

@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/opa-operator"
 
 [workspace.dependencies]
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.91.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.92.0" }
 
 anyhow = "1.0"
 axum = "0.8"

Cargo.nix

@@ -19,16 +19,9 @@ fi
 
 case "$1" in
 "helm")
-echo "Adding 'stackable-dev' Helm Chart repository"
-# tag::helm-add-repo[]
-helm repo add stackable-dev https://repo.stackable.tech/repository/helm-dev/
-# end::helm-add-repo[]
-echo "Updating Helm repo"
-helm repo update
-
 echo "Installing operators with Helm"
 # tag::helm-install-operators[]
-helm install --wait opa-operator stackable-dev/opa-operator --version 0.0.0-dev
+helm install --wait opa-operator oci://oci.stackable.tech/sdp-charts/opa-operator --version 0.0.0-dev
 # end::helm-install-operators[]
 ;;
 "stackablectl")

Cargo.toml

@@ -19,16 +19,9 @@ fi
 
 case "$1" in
 "helm")
-echo "Adding 'stackable-dev' Helm Chart repository"
-# tag::helm-add-repo[]
-helm repo add {{ helm.repo_name }} {{ helm.repo_url }}
-# end::helm-add-repo[]
-echo "Updating Helm repo"
-helm repo update
-
 echo "Installing operators with Helm"
 # tag::helm-install-operators[]
-helm install --wait opa-operator {{ helm.repo_name }}/opa-operator --version {{ versions.opa }}
+helm install --wait opa-operator oci://{{ helm.repo_url }}/{{ helm.repo_name }}/opa-operator --version {{ versions.opa }}
 # end::helm-install-operators[]
 ;;
 "stackablectl")

crate-hashes.json

@@ -34,14 +34,10 @@ Helm::
 +
 --
 You can also use Helm to install the operator.
-Add the Stackable Helm repository:
 
-[source,shell]
-----
-include::example$getting_started/getting_started.sh[tag=helm-add-repo]
-----
+NOTE: `helm repo` subcommands are not supported for OCI registries. The operators are installed directly, without adding the Helm Chart repository first.
 
-Then install the Stackable OPA operator:
+Install the Stackable OPA operator:
 
 [source,shell]
 ----

docs/modules/opa/examples/getting_started/getting_started.sh

@@ -1,6 +1,6 @@
 ---
 helm:
-  repo_name: stackable-dev
-  repo_url: https://repo.stackable.tech/repository/helm-dev/
+  repo_name: sdp-charts
+  repo_url: oci.stackable.tech
 versions:
   opa: 0.0.0-dev

docs/modules/opa/examples/getting_started/getting_started.sh.j2

@@ -782,6 +782,8 @@ fn build_server_rolegroup_daemonset(
         .context(AddVolumeMountSnafu)?
         .resources(merged_config.resources.to_owned().into());
 
+    let console_and_file_log_level = bundle_builder_log_level(merged_config);
+
     cb_bundle_builder
         .image_from_product_image(resolved_product_image) // inherit the pull policy and pull secrets, and then...
         .image(opa_bundle_builder_image) // ...override the image
@@ -797,12 +799,10 @@ fn build_server_rolegroup_daemonset(
             &bundle_builder_container_name,
         )])
         .add_env_var_from_field_path("WATCH_NAMESPACE", FieldPathEnvVar::Namespace)
+        .add_env_var("CONSOLE_LOG_LEVEL", console_and_file_log_level.to_string())
+        .add_env_var("FILE_LOG_LEVEL", console_and_file_log_level.to_string())
         .add_env_var(
-            "CONSOLE_LOG",
-            bundle_builder_log_level(merged_config).to_string(),
-        )
-        .add_env_var(
-            "ROLLING_LOGS_DIR",
+            "FILE_LOG_DIRECTORY",
             format!("{STACKABLE_LOG_DIR}/{bundle_builder_container_name}"),
         )
         .add_volume_mount(BUNDLES_VOLUME_NAME, BUNDLES_DIR)
@@ -1203,11 +1203,7 @@ fn build_opa_start_command(merged_config: &v1alpha1::OpaConfig, container_name:
     // See https://stackoverflow.com/a/8048493
 
     let logging_redirects = format!(
-        "&> >(CONSOLE_LEVEL={console} FILE_LEVEL={file} DECISION_LEVEL={decision} SERVER_LEVEL={server} OPA_ROLLING_LOG_FILE_SIZE_BYTES={OPA_ROLLING_LOG_FILE_SIZE_BYTES} OPA_ROLLING_LOG_FILES={OPA_ROLLING_LOG_FILES} STACKABLE_LOG_DIR={STACKABLE_LOG_DIR} CONTAINER_NAME={container_name} process-logs)",
-        file = file_log_level,
-        console = console_log_level,
-        decision = decision_log_level,
-        server = server_log_level
+        "&> >(CONSOLE_LEVEL={console_log_level} FILE_LEVEL={file_log_level} DECISION_LEVEL={decision_log_level} SERVER_LEVEL={server_log_level} OPA_ROLLING_LOG_FILE_SIZE_BYTES={OPA_ROLLING_LOG_FILE_SIZE_BYTES} OPA_ROLLING_LOG_FILES={OPA_ROLLING_LOG_FILES} STACKABLE_LOG_DIR={STACKABLE_LOG_DIR} CONTAINER_NAME={container_name} process-logs)"
     );
 
     // TODO: Think about adding --shutdown-wait-period, as suggested by https://github.com/open-policy-agent/opa/issues/2764