From dfc212513bbd9ba4559ce0f1224dfa7f320d884a Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 13 Oct 2026 13:42:39 +0200 Subject: [PATCH 1/3] feat: Support Vector 0.58.0 --- CHANGELOG.md | 6 +- Cargo.lock | 49 +++++--- Cargo.nix | 118 +++++++++++++----- Cargo.toml | 2 +- crate-hashes.json | 18 +-- .../build/product_logging/test-vector.sh | 27 ++-- .../build/product_logging/vector-test.yaml | 16 +++ .../build/product_logging/vector.yaml | 11 +- ...-install-opensearch-vector-aggregator.yaml | 2 +- 9 files changed, 171 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e12525c..59722e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Bump stackable-operator to 0.118.0 ([#166], [#171], [#186]). +- Bump stackable-operator to 0.119.0 ([#166], [#171], [#186], [#190]). - BREAKING: `spec.image.stackableVersion` must now be a full, valid semver version, e.g. `26.7.1`. Abbreviated values such as `26.7` are no longer accepted ([#186]). - BREAKING: `spec.image.pullPolicy` now defaults to `IfNotPresent` for non-floating tags instead of @@ -26,8 +26,7 @@ All notable changes to this project will be documented in this file. operator-specific validation code ([#171]). - All product containers now run with `securityContext.runAsNonRoot` set to `true` to improve security ([#172]). - The operator now early-exits the reconcile action when the cluster is marked for deletion ([#179]). -- Bump stackable-operator to 0.119.0 ([#190]). -- test: Bump vector-aggregator to 0.58.0 ([#195]). +- Support Vector 0.58.0 ([#195], [#197]). ### Fixed @@ -43,6 +42,7 @@ All notable changes to this project will be documented in this file. [#189]: https://github.com/stackabletech/opensearch-operator/pull/189 [#190]: https://github.com/stackabletech/opensearch-operator/pull/190 [#195]: https://github.com/stackabletech/opensearch-operator/pull/195 +[#197]: https://github.com/stackabletech/opensearch-operator/pull/197 ## [26.7.0] - 2026-07-21 diff --git a/Cargo.lock b/Cargo.lock index 41e8cf0..8e246eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1711,7 +1711,7 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "darling 0.24.0", "regex", @@ -1875,6 +1875,12 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +[[package]] +name = "libyaml-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e126dda6f34391ab7b444f9922055facc83c07a910da3eb16f1e4d9c45dc777" + [[package]] name = "libz-sys" version = "1.1.29" @@ -3169,7 +3175,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stackable-certs" version = "0.4.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "const-oid", "ecdsa", @@ -3214,8 +3220,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.119.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.120.0" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "base64 0.23.1", "clap", @@ -3238,7 +3244,6 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml", "sha2", "snafu 0.9.2", "stackable-operator-derive", @@ -3254,12 +3259,13 @@ dependencies = [ "url", "uuid", "xml", + "yaml_serde", ] [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "darling 0.24.0", "proc-macro2", @@ -3270,7 +3276,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.1.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "jiff", "k8s-openapi", @@ -3278,16 +3284,16 @@ dependencies = [ "schemars", "semver", "serde", - "serde_yaml", "snafu 0.9.2", "strum", "time", + "yaml_serde", ] [[package]] name = "stackable-telemetry" version = "0.6.5" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "axum", "clap", @@ -3310,22 +3316,22 @@ dependencies = [ [[package]] name = "stackable-versioned" -version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.12.0" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "kube", "schemars", "serde", "serde_json", - "serde_yaml", "snafu 0.9.2", "stackable-versioned-macros", + "yaml_serde", ] [[package]] name = "stackable-versioned-macros" -version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.12.0" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "convert_case", "darling 0.24.0", @@ -3342,7 +3348,7 @@ dependencies = [ [[package]] name = "stackable-webhook" version = "0.10.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#d46d75a2fa2156ea487848729c0d30840784a825" dependencies = [ "arc-swap", "async-trait", @@ -4305,6 +4311,19 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52" +[[package]] +name = "yaml_serde" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b729a08a9a6be689bbad3e2bf8015926db54b6622cc89c3a5f7dc174b9e918" +dependencies = [ + "indexmap", + "itoa", + "libyaml-rs", + "ryu", + "serde", +] + [[package]] name = "yansi" version = "1.0.1" diff --git a/Cargo.nix b/Cargo.nix index 4ce1fa0..0a85342 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5414,8 +5414,8 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "k8s_version"; @@ -6147,6 +6147,19 @@ rec { }; resolvedDefaultFeatures = [ "arch" "default" ]; }; + "libyaml-rs" = rec { + crateName = "libyaml-rs"; + version = "0.3.0"; + edition = "2021"; + crateBin = []; + sha256 = "0xy7bp2dkr7i2vms63cigb087k7salh95ya4njvilf9ldzd6s4if"; + libName = "libyaml_rs"; + authors = [ + "David Tolnay " + "YAML Organization " + ]; + + }; "libz-sys" = rec { crateName = "libz-sys"; version = "1.1.29"; @@ -10369,8 +10382,8 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "stackable_certs"; @@ -10569,12 +10582,12 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.119.0"; + version = "0.120.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "stackable_operator"; @@ -10677,10 +10690,6 @@ rec { name = "serde_json"; packageId = "serde_json"; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "sha2"; packageId = "sha2"; @@ -10750,6 +10759,10 @@ rec { name = "xml"; packageId = "xml"; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; features = { "certs" = [ "dep:stackable-certs" ]; @@ -10772,8 +10785,8 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; procMacro = true; @@ -10807,8 +10820,8 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "stackable_shared"; @@ -10847,10 +10860,6 @@ rec { packageId = "serde"; features = [ "derive" ]; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "snafu"; packageId = "snafu 0.9.2"; @@ -10865,6 +10874,10 @@ rec { packageId = "time"; optional = true; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; devDependencies = [ { @@ -10888,8 +10901,8 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "stackable_telemetry"; @@ -10994,12 +11007,12 @@ rec { }; "stackable-versioned" = rec { crateName = "stackable-versioned"; - version = "0.11.1"; + version = "0.12.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "stackable_versioned"; @@ -11027,10 +11040,6 @@ rec { name = "serde_json"; packageId = "serde_json"; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "snafu"; packageId = "snafu 0.9.2"; @@ -11039,17 +11048,21 @@ rec { name = "stackable-versioned-macros"; packageId = "stackable-versioned-macros"; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; }; "stackable-versioned-macros" = rec { crateName = "stackable-versioned-macros"; - version = "0.11.1"; + version = "0.12.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; procMacro = true; @@ -11112,8 +11125,8 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "d46d75a2fa2156ea487848729c0d30840784a825"; sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; }; libName = "stackable_webhook"; @@ -15093,6 +15106,45 @@ rec { ]; }; + "yaml_serde" = rec { + crateName = "yaml_serde"; + version = "0.10.7"; + edition = "2021"; + sha256 = "0679p5sc2zaz7afchb32nradn9jr07w2ngmdpf4ycswsiah2kdrk"; + authors = [ + "YAML Organization " + ]; + dependencies = [ + { + name = "indexmap"; + packageId = "indexmap"; + usesDefaultFeatures = false; + } + { + name = "itoa"; + packageId = "itoa"; + } + { + name = "libyaml-rs"; + packageId = "libyaml-rs"; + } + { + name = "ryu"; + packageId = "ryu"; + } + { + name = "serde"; + packageId = "serde"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "serde/std" "indexmap/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; "yansi" = rec { crateName = "yansi"; version = "1.0.1"; diff --git a/Cargo.toml b/Cargo.toml index cf6f3f8..04e5f22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,5 +29,5 @@ tracing = "0.1" uuid = "1.24" [patch."https://github.com/stackabletech/operator-rs"] -# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } +stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/26.11/version-bumps/vector" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } diff --git a/crate-hashes.json b/crate-hashes.json index 2046087..118a76a 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,11 +1,11 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#k8s-version@0.1.3": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-certs@0.4.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-operator-derive@0.3.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-operator@0.119.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-shared@0.1.2": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-telemetry@0.6.5": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-versioned-macros@0.11.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-versioned@0.11.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-webhook@0.10.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0" + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#k8s-version@0.1.3": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-certs@0.4.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-operator-derive@0.3.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-operator@0.120.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-shared@0.1.2": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-telemetry@0.6.5": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-versioned-macros@0.12.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-versioned@0.12.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-webhook@0.10.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0" } \ No newline at end of file diff --git a/rust/operator-binary/src/controller/build/product_logging/test-vector.sh b/rust/operator-binary/src/controller/build/product_logging/test-vector.sh index f548ddb..92801f6 100755 --- a/rust/operator-binary/src/controller/build/product_logging/test-vector.sh +++ b/rust/operator-binary/src/controller/build/product_logging/test-vector.sh @@ -1,17 +1,18 @@ #!/usr/bin/env sh -SUBSTITUTED_VECTOR_YAML="vector-subst.yaml" -trap 'rm "$SUBSTITUTED_VECTOR_YAML"' EXIT +export DATA_DIR=/stackable/log/_vector-state +export LOG_DIR=/stackable/log +export OPENSEARCH_SERVER_LOG_FILE=opensearch_server.json +export NAMESPACE=default +export CLUSTER_NAME=opensearch +export ROLE_NAME=nodes +export ROLE_GROUP_NAME=cluster-manager +export VECTOR_AGGREGATOR_ADDRESS=http://vector-aggregator:6000 +export VECTOR_FILE_LOG_LEVEL=info -DATA_DIR=/stackable/log/_vector-state \ -LOG_DIR=/stackable/log \ -OPENSEARCH_SERVER_LOG_FILE=opensearch_server.json \ -NAMESPACE=default \ -CLUSTER_NAME=opensearch \ -ROLE_NAME=nodes \ -ROLE_GROUP_NAME=cluster-manager \ -VECTOR_AGGREGATOR_ADDRESS=vector-aggregator \ -VECTOR_FILE_LOG_LEVEL=info \ -envsubst < vector.yaml > "$SUBSTITUTED_VECTOR_YAML" +# Required because vector.yaml contains ${...} placeholders +export VECTOR_DANGEROUSLY_ALLOW_ENV_VAR_INTERPOLATION=true -vector test "$SUBSTITUTED_VECTOR_YAML" vector-test.yaml +vector validate --no-environment vector.yaml + +vector test vector.yaml vector-test.yaml diff --git a/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml b/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml index 0813bca..75511d2 100644 --- a/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml +++ b/rust/operator-binary/src/controller/build/product_logging/vector-test.yaml @@ -17,6 +17,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -61,6 +62,7 @@ tests: timestamp: 2025-10-01T12:47:29.473451193+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -107,6 +109,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -141,6 +144,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -175,6 +179,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -206,6 +211,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -240,6 +246,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -274,6 +281,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -308,6 +316,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -342,6 +351,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -373,6 +383,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -407,6 +418,7 @@ tests: timestamp: 2025-10-01T12:47:29.473487331+0000 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -449,6 +461,7 @@ tests: version: 0.49.0 outputs: - extract_from: extended_logs + expected_event_count: 1 conditions: - type: vrl source: | @@ -493,6 +506,7 @@ tests: level: INFO outputs: - extract_from: filtered_logs_vector + expected_event_count: 1 conditions: - type: vrl source: | @@ -506,6 +520,7 @@ tests: level: WARN outputs: - extract_from: filtered_logs_vector + expected_event_count: 1 conditions: - type: vrl source: | @@ -519,6 +534,7 @@ tests: level: ERROR outputs: - extract_from: filtered_logs_vector + expected_event_count: 1 conditions: - type: vrl source: | diff --git a/rust/operator-binary/src/controller/build/product_logging/vector.yaml b/rust/operator-binary/src/controller/build/product_logging/vector.yaml index 3cc4ab1..766ea3a 100644 --- a/rust/operator-binary/src/controller/build/product_logging/vector.yaml +++ b/rust/operator-binary/src/controller/build/product_logging/vector.yaml @@ -93,7 +93,7 @@ transforms: # Extends the processed files with the fields "container" and "file" extended_logs_files: inputs: - - processed_files_* + - processed_files_opensearch_server type: remap source: | del(.source_type) @@ -133,7 +133,8 @@ transforms: # Add the fields "namespace", "cluster", "role" and "roleGroup" to all logs extended_logs: inputs: - - extended_logs_* + - extended_logs_files + - extended_logs_vector type: remap source: | .namespace = "${NAMESPACE}" @@ -147,7 +148,11 @@ sinks: inputs: - extended_logs type: vector - address: ${VECTOR_AGGREGATOR_ADDRESS} + routing: + endpoints: + - ${VECTOR_AGGREGATOR_ADDRESS} + compression: zstd + keepalive: {} console: inputs: - vector diff --git a/tests/templates/kuttl/logging/10-install-opensearch-vector-aggregator.yaml b/tests/templates/kuttl/logging/10-install-opensearch-vector-aggregator.yaml index de8350b..71fd22f 100644 --- a/tests/templates/kuttl/logging/10-install-opensearch-vector-aggregator.yaml +++ b/tests/templates/kuttl/logging/10-install-opensearch-vector-aggregator.yaml @@ -14,4 +14,4 @@ kind: ConfigMap metadata: name: opensearch-vector-aggregator-discovery data: - ADDRESS: opensearch-vector-aggregator:6123 + ADDRESS: http://opensearch-vector-aggregator:6123 From dd75648c3955e716d6d72138a8530ce0ac1807d5 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Tue, 13 Oct 2026 17:36:22 +0200 Subject: [PATCH 2/3] chore: Regenerate Nix files --- Cargo.nix | 18 +++++++++--------- crate-hashes.json | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 0a85342..4da9362 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5416,7 +5416,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "k8s_version"; authors = [ @@ -10384,7 +10384,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "stackable_certs"; authors = [ @@ -10588,7 +10588,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "stackable_operator"; authors = [ @@ -10787,7 +10787,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -10822,7 +10822,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "stackable_shared"; authors = [ @@ -10903,7 +10903,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "stackable_telemetry"; authors = [ @@ -11013,7 +11013,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "stackable_versioned"; authors = [ @@ -11063,7 +11063,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -11127,7 +11127,7 @@ rec { src = pkgs.fetchgit { url = "https://github.com/stackabletech//operator-rs.git"; rev = "d46d75a2fa2156ea487848729c0d30840784a825"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + sha256 = "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx"; }; libName = "stackable_webhook"; authors = [ diff --git a/crate-hashes.json b/crate-hashes.json index 118a76a..b585b2a 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,11 +1,11 @@ { - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#k8s-version@0.1.3": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-certs@0.4.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-operator-derive@0.3.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-operator@0.120.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-shared@0.1.2": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-telemetry@0.6.5": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-versioned-macros@0.12.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-versioned@0.12.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-webhook@0.10.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0" + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#k8s-version@0.1.3": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-certs@0.4.1": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-operator-derive@0.3.1": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-operator@0.120.0": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-shared@0.1.2": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-telemetry@0.6.5": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-versioned-macros@0.12.0": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-versioned@0.12.0": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx", + "git+https://github.com/stackabletech//operator-rs.git?branch=chore%2F26.11%2Fversion-bumps%2Fvector#stackable-webhook@0.10.0": "18phgl96sxkgbhaq5jswsysrpmvm6b1bw7rlh7a353zwhfa7wnkx" } \ No newline at end of file From aa2ecec168449cc32f03aa1db43846db22755d17 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 14 Oct 2026 16:57:49 +0200 Subject: [PATCH 3/3] fix: Fail test-vector.sh on validation errors --- .../src/controller/build/product_logging/test-vector.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rust/operator-binary/src/controller/build/product_logging/test-vector.sh b/rust/operator-binary/src/controller/build/product_logging/test-vector.sh index 92801f6..bee7acc 100755 --- a/rust/operator-binary/src/controller/build/product_logging/test-vector.sh +++ b/rust/operator-binary/src/controller/build/product_logging/test-vector.sh @@ -1,5 +1,7 @@ #!/usr/bin/env sh +set -eu + export DATA_DIR=/stackable/log/_vector-state export LOG_DIR=/stackable/log export OPENSEARCH_SERVER_LOG_FILE=opensearch_server.json