Skip to content

Commit 7706e88

Browse files
committed
push opa connect string calc down to function
1 parent ae6a58b commit 7706e88

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

rust/operator-binary/src/controller.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@ pub async fn reconcile_kafka(
263263
validate::validate(kafka, dereferenced_objects, &ctx.operator_environment)
264264
.context(ValidateClusterSnafu)?;
265265

266-
let opa_connect = validated_cluster
267-
.authorization_config
268-
.as_ref()
269-
.map(|auth_config| auth_config.opa_connect.clone());
270-
271266
let mut cluster_resources = ClusterResources::new(
272267
APP_NAME,
273268
OPERATOR_NAME,
@@ -347,7 +342,6 @@ pub async fn reconcile_kafka(
347342
validated_rg,
348343
&kafka_listeners,
349344
&pod_descriptors,
350-
opa_connect.as_deref(),
351345
)
352346
.context(BuildConfigMapSnafu)?;
353347

rust/operator-binary/src/controller/build/config_map.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,17 @@ pub fn build_rolegroup_config_map(
7676
validated_rg: &ValidatedRoleGroupConfig,
7777
listener_config: &KafkaListenerConfig,
7878
pod_descriptors: &[KafkaPodDescriptor],
79-
opa_connect_string: Option<&str>,
8079
) -> Result<ConfigMap, Error> {
8180
let kafka_security = &validated_cluster.kafka_security;
8281
let resolved_product_image = &validated_cluster.image;
8382
let kafka_config_file_name = validated_rg.merged_config.config_file_name();
8483
let config_overrides = validated_rg.config_file_overrides.clone();
8584

85+
let opa_connect = validated_cluster
86+
.authorization_config
87+
.as_ref()
88+
.map(|auth_config| auth_config.opa_connect.clone());
89+
8690
let metadata_manager = kafka
8791
.effective_metadata_manager()
8892
.context(InvalidMetadataManagerSnafu)?;
@@ -92,7 +96,7 @@ pub fn build_rolegroup_config_map(
9296
kafka_security,
9397
listener_config,
9498
pod_descriptors,
95-
opa_connect_string,
99+
opa_connect.as_deref(),
96100
metadata_manager == MetadataManager::KRaft,
97101
kafka
98102
.spec

0 commit comments

Comments
 (0)