From 9034b7ca6331f619e91ec96b4ed8e503f22ba72d Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 9 Oct 2023 14:04:40 +0200 Subject: [PATCH 1/7] remove obsolete selector --- .../templates/kuttl/cluster-operation/10-install-opa.yaml.j2 | 5 +---- tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 | 5 +---- tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 | 5 +---- .../templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 | 5 +---- tests/templates/kuttl/smoke/10-install-opa.yaml.j2 | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 index 0671fec4..3de800ed 100644 --- a/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/10-install-opa.yaml.j2 @@ -15,7 +15,4 @@ spec: logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} diff --git a/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 index 67a720f3..fdcfe53e 100644 --- a/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/20-stop-opa.yaml.j2 @@ -18,7 +18,4 @@ spec: logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} diff --git a/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 index 404d4b54..e2001489 100644 --- a/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/30-pause-opa.yaml.j2 @@ -18,7 +18,4 @@ spec: logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} diff --git a/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 index d5b62313..01db2a31 100644 --- a/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/40-restart-opa.yaml.j2 @@ -18,7 +18,4 @@ spec: logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} diff --git a/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 b/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 index dfb26a70..b523dc2f 100644 --- a/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 +++ b/tests/templates/kuttl/smoke/10-install-opa.yaml.j2 @@ -33,7 +33,4 @@ spec: logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} From 35298de7b05e69925893d425dd10557dcb3c3fcb Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 9 Oct 2023 14:04:54 +0200 Subject: [PATCH 2/7] bump version to 0.57.0 --- docs/modules/opa/examples/getting_started/opa.yaml | 7 ++----- docs/modules/opa/examples/getting_started/opa.yaml.j2 | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docs/modules/opa/examples/getting_started/opa.yaml b/docs/modules/opa/examples/getting_started/opa.yaml index 8eac3d77..ff384072 100644 --- a/docs/modules/opa/examples/getting_started/opa.yaml +++ b/docs/modules/opa/examples/getting_started/opa.yaml @@ -5,10 +5,7 @@ metadata: name: simple-opa spec: image: - productVersion: "0.51.0" + productVersion: "0.57.0" servers: roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} diff --git a/docs/modules/opa/examples/getting_started/opa.yaml.j2 b/docs/modules/opa/examples/getting_started/opa.yaml.j2 index 8eac3d77..ff384072 100644 --- a/docs/modules/opa/examples/getting_started/opa.yaml.j2 +++ b/docs/modules/opa/examples/getting_started/opa.yaml.j2 @@ -5,10 +5,7 @@ metadata: name: simple-opa spec: image: - productVersion: "0.51.0" + productVersion: "0.57.0" servers: roleGroups: - default: - selector: - matchLabels: - kubernetes.io/os: linux + default: {} From 68bf2b611fc8b1e8b9ae15f1b214ebb8a3d3b5a3 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 9 Oct 2023 14:05:09 +0200 Subject: [PATCH 3/7] add 0.57.0, remove obsolete versions --- docs/modules/opa/partials/supported-versions.adoc | 6 +----- tests/test-definition.yaml | 6 ++---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/docs/modules/opa/partials/supported-versions.adoc b/docs/modules/opa/partials/supported-versions.adoc index 5a8dbbcc..05a62d21 100644 --- a/docs/modules/opa/partials/supported-versions.adoc +++ b/docs/modules/opa/partials/supported-versions.adoc @@ -2,9 +2,5 @@ // This is a separate file, since it is used by both the direct OPA documentation, and the overarching // Stackable Platform documentation. +- 0.57.0 - 0.51.0 -- 0.45.0 -- 0.41.0 -- 0.37.2 -- 0.28.0 -- 0.27.1 diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 07766f7b..102ed396 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -2,13 +2,11 @@ dimensions: - name: opa values: - - 0.37.2 - - 0.41.0 - - 0.45.0 - 0.51.0 + - 0.57.0 - name: opa-latest values: - - 0.51.0 + - 0.57.0 tests: - name: smoke dimensions: From 583de74c07705910c64c849ba66bf366086d2dbb Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 9 Oct 2023 14:07:57 +0200 Subject: [PATCH 4/7] adapted changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bea8eb2..789ec30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,15 +8,21 @@ All notable changes to this project will be documented in this file. - Default stackableVersion to operator version ([#467]). - Document we don't create PodDisruptionBudgets ([#480]). +- Added support for 0.57.0 ([#482]). ### Changed - `vector` `0.26.0` -> `0.31.0` ([#465]). - `operator-rs` `0.44.0` -> `0.52.1` ([#467], [#480]). +### Removed + +- Removed support for versions 0.45.0, 0.41.0, 0.37.2, 0.28.0, 0.27.1 ([#482]). + [#465]: https://github.com/stackabletech/opa-operator/pull/465 [#467]: https://github.com/stackabletech/opa-operator/pull/467 [#480]: https://github.com/stackabletech/opa-operator/pull/480 +[#482]: https://github.com/stackabletech/opa-operator/pull/482 ## [23.7.0] - 2023-07-14 From 477a0360fd13246a53c6b215018b61b8c7612ea5 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 13 Oct 2023 13:12:48 +0200 Subject: [PATCH 5/7] bump vector aggregator --- .../kuttl/logging/01-install-opa-vector-aggregator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/logging/01-install-opa-vector-aggregator.yaml b/tests/templates/kuttl/logging/01-install-opa-vector-aggregator.yaml index b8e68aa5..e980a4a8 100644 --- a/tests/templates/kuttl/logging/01-install-opa-vector-aggregator.yaml +++ b/tests/templates/kuttl/logging/01-install-opa-vector-aggregator.yaml @@ -5,7 +5,7 @@ commands: - script: >- helm install opa-vector-aggregator vector --namespace $NAMESPACE - --version 0.23.0 + --version 0.26.0 --repo https://helm.vector.dev --values opa-vector-aggregator-values.yaml --- From d01be3d52ee8b1a43ef34d94fe0c8d5fdfc60945 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 16 Oct 2023 14:15:35 +0200 Subject: [PATCH 6/7] bump operator-rs to 0.55.0 --- Cargo.lock | 8 +++---- Cargo.toml | 2 +- deploy/helm/opa-operator/crds/crds.yaml | 32 ++++++++++++++++++------- rust/operator-binary/src/controller.rs | 2 +- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75237c1b..b52195f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1803,8 +1803,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.52.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.52.0#a6fdaf82c13d24765bf217a3a35b53683fc02fdc" +version = "0.55.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.55.0#bfbc23d3819f815413cb4135e0835acd76aecf97" dependencies = [ "chrono", "clap", @@ -1837,8 +1837,8 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.52.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.52.0#a6fdaf82c13d24765bf217a3a35b53683fc02fdc" +version = "0.55.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.55.0#bfbc23d3819f815413cb4135e0835acd76aecf97" dependencies = [ "darling 0.20.3", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index c3226154..7602ab25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = "0.7" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.52.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.55.0" } strum = { version = "0.25", features = ["derive"] } tokio = { version = "1.29", features = ["full"] } tracing = "0.1" diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml index 4e19381c..5d7bfcd3 100644 --- a/deploy/helm/opa-operator/crds/crds.yaml +++ b/deploy/helm/opa-operator/crds/crds.yaml @@ -124,6 +124,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -131,13 +132,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -153,14 +155,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -174,9 +178,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -189,10 +194,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object @@ -3062,6 +3070,7 @@ spec: default: enableVectorAgent: null containers: {} + description: Logging configuration properties: containers: additionalProperties: @@ -3069,13 +3078,14 @@ spec: - required: - custom - {} - description: Fragment derived from `ContainerLogConfigChoice` + description: Log configuration of the container properties: console: + description: Configuration for the console appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -3091,14 +3101,16 @@ spec: description: Custom log configuration provided in a ConfigMap properties: configMap: + description: ConfigMap containing the log configuration files nullable: true type: string type: object file: + description: Configuration for the file appender nullable: true properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -3112,9 +3124,10 @@ spec: type: object loggers: additionalProperties: + description: Configuration of a logger properties: level: - description: Log levels + description: The log level threshold. Log events with a lower log level are discarded. enum: - TRACE - DEBUG @@ -3127,10 +3140,13 @@ spec: type: string type: object default: {} + description: Configuration per logger type: object type: object + description: Log configuration per container type: object enableVectorAgent: + description: Wether or not to deploy a container with the Vector log agent nullable: true type: boolean type: object diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index bbd05a3b..1efaa24e 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -18,7 +18,6 @@ use stackable_operator::{ }, cluster_resources::{ClusterResourceApplyStrategy, ClusterResources}, commons::{product_image_selection::ResolvedProductImage, rbac::build_rbac_resources}, - duration::Duration, k8s_openapi::{ api::{ apps::v1::{DaemonSet, DaemonSetSpec}, @@ -51,6 +50,7 @@ use stackable_operator::{ compute_conditions, daemonset::DaemonSetConditionBuilder, operations::ClusterOperationsConditionBuilder, }, + time::Duration, }; use std::{ borrow::Cow, From e2b6d3ae6111b2c7a36ba172e20161c361c947f4 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Wed, 18 Oct 2023 08:56:03 +0200 Subject: [PATCH 7/7] adapt changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 789ec30c..8fd3c3f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,8 @@ All notable changes to this project will be documented in this file. ### Changed -- `vector` `0.26.0` -> `0.31.0` ([#465]). -- `operator-rs` `0.44.0` -> `0.52.1` ([#467], [#480]). +- `vector` `0.26.0` -> `0.33.0` ([#465], [#482]). +- `operator-rs` `0.44.0` -> `0.55.0` ([#467], [#480], [#482]). ### Removed