Skip to content

Commit 7dae34d

Browse files
committed
Apply recommended labels to the bootstrap listener PVC too
1 parent 534d88e commit 7dae34d

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

rust/operator-binary/src/kafka_controller.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -772,6 +772,15 @@ fn build_broker_rolegroup_statefulset(
772772
let rolegroup = kafka
773773
.rolegroup(rolegroup_ref)
774774
.context(InternalOperatorSnafu)?;
775+
let recommended_object_labels = build_recommended_labels(
776+
kafka,
777+
KAFKA_CONTROLLER_NAME,
778+
&resolved_product_image.app_version_label,
779+
&rolegroup_ref.role,
780+
&rolegroup_ref.role_group,
781+
);
782+
let recommended_labels =
783+
Labels::recommended(recommended_object_labels.clone()).context(LabelBuildSnafu)?;
775784

776785
let kcat_prober_container_name = Container::KcatProber.to_string();
777786
let mut cb_kcat_prober =
@@ -799,7 +808,7 @@ fn build_broker_rolegroup_statefulset(
799808
pvcs.push(
800809
ListenerOperatorVolumeSourceBuilder::new(
801810
&ListenerReference::ListenerName(kafka.bootstrap_service_name(rolegroup_ref)),
802-
&Labels::new(),
811+
&recommended_labels,
803812
)
804813
.and_then(|builder| builder.build_pvc(LISTENER_BOOTSTRAP_VOLUME_NAME))
805814
.unwrap(),
@@ -947,15 +956,8 @@ fn build_broker_rolegroup_statefulset(
947956
});
948957
}
949958

950-
let recommended_labels = build_recommended_labels(
951-
kafka,
952-
KAFKA_CONTROLLER_NAME,
953-
&resolved_product_image.app_version_label,
954-
&rolegroup_ref.role,
955-
&rolegroup_ref.role_group,
956-
);
957959
let metadata = ObjectMetaBuilder::new()
958-
.with_recommended_labels(recommended_labels.clone())
960+
.with_recommended_labels(recommended_object_labels)
959961
.context(MetadataBuildSnafu)?
960962
.build();
961963

@@ -977,7 +979,7 @@ fn build_broker_rolegroup_statefulset(
977979
.add_listener_volume_by_listener_class(
978980
LISTENER_BROKER_VOLUME_NAME,
979981
&merged_config.broker_listener_class,
980-
&Labels::recommended(recommended_labels).context(LabelBuildSnafu)?,
982+
&recommended_labels,
981983
)
982984
.context(AddListenerVolumeSnafu)?
983985
.add_empty_dir_volume(

0 commit comments

Comments
 (0)