diff --git a/CHANGELOG.md b/CHANGELOG.md index d9f2f8f..02ed2f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file. ### Changed -- Bump stackable-operator to 0.114.0 ([#166]). +- Bump stackable-operator to 0.115.0 ([#166], [#171]). +- Remove the product version label from PersistentVolumeClaims ([#171]). - All product containers now run with `securityContext.runAsNonRoot` set to `true` to improve security ([#172]). ### Fixed @@ -16,6 +17,7 @@ All notable changes to this project will be documented in this file. See [our internal issue](https://github.com/stackabletech/hdfs-operator/issues/626) and [the fix](https://github.com/kube-rs/kube/pull/2042) for details ([#172]). [#166]: https://github.com/stackabletech/opensearch-operator/pull/166 +[#171]: https://github.com/stackabletech/opensearch-operator/pull/171 [#172]: https://github.com/stackabletech/opensearch-operator/pull/172 ## [26.7.0] - 2026-07-21 diff --git a/Cargo.lock b/Cargo.lock index b94d671..8b87fc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1720,7 +1720,7 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "darling 0.24.0", "regex", @@ -3173,7 +3173,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stackable-certs" version = "0.4.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "const-oid", "ecdsa", @@ -3218,7 +3218,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.115.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "base64 0.23.1", "clap", @@ -3262,7 +3262,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "darling 0.24.0", "proc-macro2", @@ -3273,7 +3273,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.1.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "jiff", "k8s-openapi", @@ -3290,7 +3290,7 @@ dependencies = [ [[package]] name = "stackable-telemetry" version = "0.6.5" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "axum", "clap", @@ -3314,7 +3314,7 @@ dependencies = [ [[package]] name = "stackable-versioned" version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "kube", "schemars", @@ -3328,7 +3328,7 @@ dependencies = [ [[package]] name = "stackable-versioned-macros" version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "convert_case", "convert_case_extras", @@ -3346,7 +3346,7 @@ dependencies = [ [[package]] name = "stackable-webhook" version = "0.9.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#ab0579876d3af6e238c0a8513b09f9c3d185de44" dependencies = [ "arc-swap", "async-trait", diff --git a/Cargo.nix b/Cargo.nix index ecadb4d..a4fab86 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5439,9 +5439,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "k8s_version"; authors = [ @@ -10374,9 +10374,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "stackable_certs"; authors = [ @@ -10574,9 +10574,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "stackable_operator"; authors = [ @@ -10756,7 +10756,8 @@ rec { "client-feature-gates" = [ "dep:winnow" ]; "crds" = [ "dep:stackable-versioned" ]; "default" = [ "crds" ]; - "full" = [ "client-feature-gates" "crds" "certs" "test-support" "time" "webhook" "kube-ws" ]; + "full" = [ "client-feature-gates" "crds" "certs" "test-support" "time" "webhook" "kube-ws" "kube-cel" ]; + "kube-cel" = [ "kube/cel" ]; "kube-ws" = [ "kube/ws" ]; "time" = [ "stackable-shared/time" ]; "webhook" = [ "dep:stackable-webhook" ]; @@ -10769,9 +10770,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -10804,9 +10805,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "stackable_shared"; authors = [ @@ -10885,9 +10886,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "stackable_telemetry"; authors = [ @@ -10995,9 +10996,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "stackable_versioned"; authors = [ @@ -11045,9 +11046,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -11113,9 +11114,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "ab0579876d3af6e238c0a8513b09f9c3d185de44"; + sha256 = "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1"; }; libName = "stackable_webhook"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index 3d6831a..b104770 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,5 +28,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 = "feat/smooth-operator/recommended-labels" } # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } diff --git a/crate-hashes.json b/crate-hashes.json index 43cd4b7..3235838 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.115.0#k8s-version@0.1.3": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-certs@0.4.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-operator-derive@0.3.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-operator@0.115.0": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-shared@0.1.2": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-telemetry@0.6.5": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-versioned-macros@0.11.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-versioned@0.11.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-webhook@0.9.2": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb" + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#k8s-version@0.1.3": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-certs@0.4.1": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-operator-derive@0.3.1": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-operator@0.115.0": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-shared@0.1.2": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-telemetry@0.6.5": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-versioned-macros@0.11.1": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-versioned@0.11.1": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1", + "git+https://github.com/stackabletech//operator-rs.git?branch=feat%2Fsmooth-operator%2Frecommended-labels#stackable-webhook@0.9.2": "0f72i9h8v8n5f0v41zgp070bvb5w7gcqvx2h01dhl2jizkarwcs1" } \ No newline at end of file diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 65fc6a5..2d2de64 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -340,10 +340,7 @@ impl ValidatedCluster { ValidatedSecurity::ManagedByApi { tls_server_secret_class: Some(_), .. - } | ValidatedSecurity::ManagedByOperator { - tls_server_secret_class: _, - .. - } + } | ValidatedSecurity::ManagedByOperator { .. } ) } } diff --git a/rust/operator-binary/src/controller/build/role_builder.rs b/rust/operator-binary/src/controller/build/role_builder.rs index 70024cf..7aa19af 100644 --- a/rust/operator-binary/src/controller/build/role_builder.rs +++ b/rust/operator-binary/src/controller/build/role_builder.rs @@ -14,12 +14,8 @@ use stackable_operator::{ }, }, kube::api::ObjectMeta, - kvp::{ - Label, Labels, - consts::{STACKABLE_VENDOR_KEY, STACKABLE_VENDOR_VALUE}, - }, + kvp::Labels, v2::{ - NameIsValidLabelValue, builder::{ meta::ownerreference_from_resource, pdb::pod_disruption_budget_builder_with_role, }, @@ -278,36 +274,20 @@ impl<'a> RoleBuilder<'a> { None, Some(true), )) - .with_labels(self.labels()) + .with_labels(self.recommended_labels()) .build() } /// Common labels for role resources - fn labels(&self) -> Labels { - // Well-known Kubernetes labels - let mut labels = Labels::role_selector( - &self.cluster, - &self.context_names.product_name.to_label_value(), - &ValidatedCluster::role_name().to_label_value(), - ) - .unwrap(); - - let managed_by = Label::managed_by( - self.context_names.operator_name.as_ref(), - self.context_names.controller_name.as_ref(), + fn recommended_labels(&self) -> Labels { + stackable_operator::v2::kvp::label::recommended_labels_for_role_resources( + &self.cluster.name, + &self.context_names.product_name, + &self.cluster.product_version, + &self.context_names.operator_name, + &self.context_names.controller_name, + &ValidatedCluster::role_name(), ) - .unwrap(); - let version = Label::version(self.cluster.product_version.as_ref()).unwrap(); - - labels.insert(managed_by); - labels.insert(version); - - // Stackable-specific labels - labels - .parse_insert((STACKABLE_VENDOR_KEY, STACKABLE_VENDOR_VALUE)) - .unwrap(); - - labels } } diff --git a/rust/operator-binary/src/controller/build/role_group_builder.rs b/rust/operator-binary/src/controller/build/role_group_builder.rs index cc8a4de..2d479fa 100644 --- a/rust/operator-binary/src/controller/build/role_group_builder.rs +++ b/rust/operator-binary/src/controller/build/role_group_builder.rs @@ -54,7 +54,11 @@ use stackable_operator::{ restarter_ignore_configmap_annotations, restarter_ignore_secret_annotations, }, }, - kvp::label::{recommended_labels, role_group_selector, role_selector}, + kvp::label::{ + recommended_labels_for_role_group_resources, + recommended_labels_for_unversioned_role_group_resources, role_group_selector, + role_selector, + }, product_logging::framework::{ STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container, }, @@ -344,7 +348,7 @@ impl<'a> RoleGroupBuilder<'a> { let role_group_listener_volume_claim_template = listener_operator_volume_source_builder_build_pvc( &ListenerReference::Listener(self.resource_names.listener_name()), - &self.recommended_labels(), + &self.recommended_labels_for_pvcs(), &ROLE_GROUP_LISTENER_VOLUME_NAME, ); @@ -355,7 +359,7 @@ impl<'a> RoleGroupBuilder<'a> { .then(|| { listener_operator_volume_source_builder_build_pvc( &ListenerReference::Listener(self.discovery_service_listener_name.to_owned()), - &self.recommended_labels(), + &self.recommended_labels_for_pvcs(), &DISCOVERY_SERVICE_LISTENER_VOLUME_NAME, ) }); @@ -505,7 +509,7 @@ impl<'a> RoleGroupBuilder<'a> { context_names: &ContextNames, ) -> Labels { let mut labels = role_selector( - cluster, + &cluster.name, &context_names.product_name, &ValidatedCluster::role_name(), ); @@ -1393,8 +1397,8 @@ impl<'a> RoleGroupBuilder<'a> { /// Recommended labels for role group resources fn recommended_labels(&self) -> Labels { - recommended_labels( - self.cluster, + recommended_labels_for_role_group_resources( + &self.cluster.name, &self.context_names.product_name, &self.cluster.product_version, &self.context_names.operator_name, @@ -1404,12 +1408,24 @@ impl<'a> RoleGroupBuilder<'a> { ) } + /// Recommended labels for PersistentVolumeClaims + fn recommended_labels_for_pvcs(&self) -> Labels { + recommended_labels_for_unversioned_role_group_resources( + &self.cluster.name, + &self.context_names.product_name, + &self.context_names.operator_name, + &self.context_names.controller_name, + &ValidatedCluster::role_name(), + &self.role_group_name, + ) + } + /// Labels to select a [`Pod`] in the role group /// /// [`Pod`]: stackable_operator::k8s_openapi::api::core::v1::Pod fn pod_selector(&self) -> Labels { role_group_selector( - self.cluster, + &self.cluster.name, &self.context_names.product_name, &ValidatedCluster::role_name(), &self.role_group_name, @@ -3186,7 +3202,6 @@ mod tests { "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster", "app.kubernetes.io/name": "opensearch", "app.kubernetes.io/role-group": "default", - "app.kubernetes.io/version": "3.6.0", "stackable.tech/vendor": "Stackable" }, "name": "listener" @@ -3216,7 +3231,6 @@ mod tests { "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster", "app.kubernetes.io/name": "opensearch", "app.kubernetes.io/role-group": "default", - "app.kubernetes.io/version": "3.6.0", "stackable.tech/vendor": "Stackable", }, "name": "discovery-service-listener", diff --git a/tests/templates/kuttl/smoke/10-assert.yaml.j2 b/tests/templates/kuttl/smoke/10-assert.yaml.j2 index cd7e78b..e4c67bc 100644 --- a/tests/templates/kuttl/smoke/10-assert.yaml.j2 +++ b/tests/templates/kuttl/smoke/10-assert.yaml.j2 @@ -324,6 +324,7 @@ spec: volumeClaimTemplate: metadata: annotations: + secrets.stackable.tech/backend.autotls.cert.domain-components-in-subject-dn: "true" secrets.stackable.tech/backend.autotls.cert.lifetime: 1d secrets.stackable.tech/class: tls secrets.stackable.tech/format: tls-pem @@ -343,6 +344,7 @@ spec: volumeClaimTemplate: metadata: annotations: + secrets.stackable.tech/backend.autotls.cert.domain-components-in-subject-dn: "true" secrets.stackable.tech/backend.autotls.cert.lifetime: 1d secrets.stackable.tech/class: tls secrets.stackable.tech/format: tls-pem @@ -453,7 +455,6 @@ spec: app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster app.kubernetes.io/name: opensearch app.kubernetes.io/role-group: cluster-manager - app.kubernetes.io/version: {{ test_scenario['values']['opensearch'].split(',')[0] }} stackable.tech/vendor: Stackable name: listener spec: @@ -475,7 +476,6 @@ spec: app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster app.kubernetes.io/name: opensearch app.kubernetes.io/role-group: cluster-manager - app.kubernetes.io/version: {{ test_scenario['values']['opensearch'].split(',')[0] }} stackable.tech/vendor: Stackable name: discovery-service-listener spec: @@ -806,9 +806,11 @@ spec: volumeClaimTemplate: metadata: annotations: + secrets.stackable.tech/backend.autotls.cert.domain-components-in-subject-dn: "true" secrets.stackable.tech/backend.autotls.cert.lifetime: 1d secrets.stackable.tech/class: tls secrets.stackable.tech/format: tls-pem + secrets.stackable.tech/provision-parts: public-private secrets.stackable.tech/scope: pod,listener-volume=listener spec: accessModes: @@ -824,9 +826,11 @@ spec: volumeClaimTemplate: metadata: annotations: + secrets.stackable.tech/backend.autotls.cert.domain-components-in-subject-dn: "true" secrets.stackable.tech/backend.autotls.cert.lifetime: 1d secrets.stackable.tech/class: tls secrets.stackable.tech/format: tls-pem + secrets.stackable.tech/provision-parts: public-private secrets.stackable.tech/scope: pod,listener-volume=listener spec: accessModes: @@ -933,7 +937,6 @@ spec: app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster app.kubernetes.io/name: opensearch app.kubernetes.io/role-group: data - app.kubernetes.io/version: {{ test_scenario['values']['opensearch'].split(',')[0] }} stackable.tech/vendor: Stackable name: listener spec: