fix smoke tests

Author: maltesander

rust/operator-binary/src/crd/listener.rs

@@ -4,7 +4,9 @@ use std::{
 };
 
 use snafu::{OptionExt, Snafu};
-use stackable_operator::{kube::ResourceExt, utils::cluster_info::KubernetesClusterInfo};
+use stackable_operator::{
+    kube::ResourceExt, role_utils::RoleGroupRef, utils::cluster_info::KubernetesClusterInfo,
+};
 use strum::{EnumDiscriminants, EnumString};
 
 use crate::crd::{STACKABLE_LISTENER_BROKER_DIR, security::KafkaTlsSecurity, v1alpha1};
@@ -170,10 +172,14 @@ impl Display for KafkaListener {
 pub fn get_kafka_listener_config(
     kafka: &v1alpha1::KafkaCluster,
     kafka_security: &KafkaTlsSecurity,
-    object_name: &str,
+    rolegroup_ref: &RoleGroupRef<v1alpha1::KafkaCluster>,
     cluster_info: &KubernetesClusterInfo,
 ) -> Result<KafkaListenerConfig, KafkaListenerError> {
-    let pod_fqdn = pod_fqdn(kafka, object_name, cluster_info)?;
+    let pod_fqdn = pod_fqdn(
+        kafka,
+        &rolegroup_ref.rolegroup_headless_service_name(),
+        cluster_info,
+    )?;
     let mut listeners = vec![];
     let mut advertised_listeners = vec![];
     let mut listener_security_protocol_map: BTreeMap<KafkaListenerName, KafkaListenerProtocol> =
@@ -334,12 +340,11 @@ pub fn node_port_cmd(directory: &str, port_name: &str) -> String {
 
 pub fn pod_fqdn(
     kafka: &v1alpha1::KafkaCluster,
-    object_name: &str,
+    sts_service_name: &str,
     cluster_info: &KubernetesClusterInfo,
 ) -> Result<String, KafkaListenerError> {
     Ok(format!(
-        "$POD_NAME.{object_name}.{namespace}.svc.{cluster_domain}",
-        object_name = object_name,
+        "$POD_NAME.{sts_service_name}.{namespace}.svc.{cluster_domain}",
         namespace = kafka.namespace().context(ObjectHasNoNamespaceSnafu)?,
         cluster_domain = cluster_info.cluster_domain
     ))

rust/operator-binary/src/resource/statefulset.rs

@@ -285,13 +285,9 @@ pub fn build_broker_rolegroup_statefulset(
         ..EnvVar::default()
     });
 
-    let kafka_listeners = get_kafka_listener_config(
-        kafka,
-        kafka_security,
-        &rolegroup_ref.object_name(),
-        cluster_info,
-    )
-    .context(InvalidKafkaListenersSnafu)?;
+    let kafka_listeners =
+        get_kafka_listener_config(kafka, kafka_security, rolegroup_ref, cluster_info)
+            .context(InvalidKafkaListenersSnafu)?;
 
     let cluster_id = kafka.cluster_id().context(ClusterIdMissingSnafu)?;
 
@@ -632,13 +628,9 @@ pub fn build_controller_rolegroup_statefulset(
         ..EnvVar::default()
     });
 
-    let kafka_listeners = get_kafka_listener_config(
-        kafka,
-        kafka_security,
-        &rolegroup_ref.object_name(),
-        cluster_info,
-    )
-    .context(InvalidKafkaListenersSnafu)?;
+    let kafka_listeners =
+        get_kafka_listener_config(kafka, kafka_security, rolegroup_ref, cluster_info)
+            .context(InvalidKafkaListenersSnafu)?;
 
     cb_kafka
         .image_from_product_image(resolved_product_image)

tests/templates/kuttl/smoke/metrics.py

@@ -12,7 +12,7 @@
         stream=sys.stdout,
     )
 
-    http_code = requests.get("http://test-kafka-broker-default:9606").status_code
+    http_code = requests.get("http://test-kafka-broker-default-metrics:9606/metrics").status_code
     if http_code != 200:
         result = 1
 

tests/templates/kuttl/smoke/test_heap.sh

@@ -4,12 +4,12 @@
 # 2Gi * 0.8 -> 1638
 EXPECTED_HEAP="-Xmx1638m -Xms1638m"
 
-# Check if ZK_SERVER_HEAP is set to the correct calculated value
+# Check if KAFKA_HEAP_OPTS is set to the correct calculated value
 if [[ $KAFKA_HEAP_OPTS == "$EXPECTED_HEAP" ]]
 then
   echo "[SUCCESS] KAFKA_HEAP_OPTS set to $EXPECTED_HEAP"
 else
-  echo "[ERROR] KAFKA_HEAP_OPTS not set or set with wrong value: $ZK_SERVER_HEAP"
+  echo "[ERROR] KAFKA_HEAP_OPTS not set or set with wrong value: $KAFKA_HEAP_OPTS"
   exit 1
 fi