|
| 1 | +use std::str::FromStr; |
| 2 | + |
1 | 3 | use stackable_operator::{ |
2 | 4 | builder::{ |
3 | 5 | meta::ObjectMetaBuilder, |
@@ -28,7 +30,7 @@ use crate::{ |
28 | 30 | controller::{ContextNames, OpenSearchRoleGroupConfig, ValidatedCluster}, |
29 | 31 | crd::v1alpha1, |
30 | 32 | framework::{ |
31 | | - RoleGroupName, |
| 33 | + ProductVersion, RoleGroupName, |
32 | 34 | builder::meta::ownerreference_from_resource, |
33 | 35 | kvp::label::{recommended_labels, role_group_selector, role_selector}, |
34 | 36 | role_group_utils::ResourceNames, |
@@ -126,8 +128,8 @@ impl<'a> RoleGroupBuilder<'a> { |
126 | 128 | // still be consistent. |
127 | 129 | let listener_volume_claim_template = ListenerOperatorVolumeSourceBuilder::new( |
128 | 130 | &ListenerReference::ListenerName(listener_group_name), |
129 | | - // TODO should be unversioned |
130 | | - &self.recommended_labels(), |
| 131 | + &self |
| 132 | + .recommended_labels(ProductVersion::from_str("none").expect("version is supplied")), |
131 | 133 | ) |
132 | 134 | .expect("should be a listener group name") |
133 | 135 | .build_pvc(LISTENER_VOLUME_NAME.to_string()) |
@@ -166,7 +168,7 @@ impl<'a> RoleGroupBuilder<'a> { |
166 | 168 | } |
167 | 169 |
|
168 | 170 | let metadata = ObjectMetaBuilder::new() |
169 | | - .with_labels(self.recommended_labels()) |
| 171 | + .with_labels(self.recommended_labels(self.cluster.product_version.clone())) |
170 | 172 | .with_labels(node_role_labels) |
171 | 173 | .build(); |
172 | 174 |
|
@@ -413,16 +415,16 @@ impl<'a> RoleGroupBuilder<'a> { |
413 | 415 | None, |
414 | 416 | Some(true), |
415 | 417 | )) |
416 | | - .with_labels(self.recommended_labels()) |
| 418 | + .with_labels(self.recommended_labels(self.cluster.product_version.clone())) |
417 | 419 | .with_labels(extra_labels) |
418 | 420 | .build() |
419 | 421 | } |
420 | 422 |
|
421 | | - fn recommended_labels(&self) -> Labels { |
| 423 | + fn recommended_labels(&self, product_version: ProductVersion) -> Labels { |
422 | 424 | recommended_labels( |
423 | 425 | &self.cluster, |
424 | 426 | &self.context_names.product_name, |
425 | | - &self.cluster.product_version, |
| 427 | + &product_version, |
426 | 428 | &self.context_names.operator_name, |
427 | 429 | &self.context_names.controller_name, |
428 | 430 | &ValidatedCluster::role_name(), |
|
0 commit comments