started kerberos tests

Author: maltesander

rust/operator-binary/src/config/node_id_hasher.rs

@@ -1,7 +1,16 @@
-pub fn node_id_hash32_offset(rolegroup: &str) -> u32 {
-    let hash = fnv_hash32(rolegroup);
+use stackable_operator::role_utils::RoleGroupRef;
+
+use crate::crd::v1alpha1::KafkaCluster;
+
+pub fn node_id_hash32_offset(rolegroup_ref: &RoleGroupRef<KafkaCluster>) -> u32 {
+    let hash = fnv_hash32(&format!(
+        "{role}-{rolegroup}",
+        role = rolegroup_ref.role,
+        rolegroup = rolegroup_ref.role_group
+    ));
     let range = hash & 0x0000FFFF;
-    let offset = range * 0x0000FFFF;
+    // unsigned in kafka
+    let offset = range * 0x00007FFF;
     offset
 }
 

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

@@ -258,12 +258,12 @@ impl v1alpha1::KafkaCluster {
                         role_group_service_name: rolegroup_ref.object_name(),
                         replica: i,
                         cluster_domain: cluster_info.cluster_domain.clone(),
-                        node_id: node_id_hash32_offset(rolegroup_name) + u32::from(i),
+                        // TODO: check for hash collisions?
+                        node_id: node_id_hash32_offset(&rolegroup_ref) + u32::from(i),
                     })
                 })
                 .collect(),
 
-            // TODO: this does not work for multiple rolegroups (the index / replica)
             KafkaRole::Controller => self
                 .controller_role()
                 .iter()
@@ -279,7 +279,8 @@ impl v1alpha1::KafkaCluster {
                         role_group_service_name: rolegroup_ref.object_name(),
                         replica: i,
                         cluster_domain: cluster_info.cluster_domain.clone(),
-                        node_id: node_id_hash32_offset(rolegroup_name) + u32::from(i),
+                        // TODO: check for hash collisions?
+                        node_id: node_id_hash32_offset(&rolegroup_ref) + u32::from(i),
                     })
                 })
                 .collect(),
@@ -312,17 +313,6 @@ impl KafkaPodDescriptor {
         )
     }
 
-    /// Return the fully qualified domain name for "replica"
-    /// Format: <service>-<replica>.<service>.<namespace>.svc.<cluster-domain>
-    pub fn fqdn_for_replica(&self, replica: u16) -> String {
-        format!(
-            "{service_name}-{replica}.{service_name}.{namespace}.svc.{cluster_domain}",
-            service_name = self.role_group_service_name,
-            namespace = self.namespace,
-            cluster_domain = self.cluster_domain
-        )
-    }
-
     pub fn pod_name(&self) -> String {
         format!("{}-{}", self.role_group_service_name, self.replica)
     }

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

@@ -333,7 +333,7 @@ pub fn build_broker_rolegroup_statefulset(
         )
         .add_env_var(
             KAFKA_NODE_ID_OFFSET,
-            node_id_hash32_offset(&rolegroup_ref.role_group).to_string(),
+            node_id_hash32_offset(&rolegroup_ref).to_string(),
         )
         .add_env_vars(env)
         .add_container_ports(container_ports(kafka_security))
@@ -675,7 +675,7 @@ pub fn build_controller_rolegroup_statefulset(
         )
         .add_env_var(
             KAFKA_NODE_ID_OFFSET,
-            node_id_hash32_offset(&rolegroup_ref.role_group).to_string(),
+            node_id_hash32_offset(&rolegroup_ref).to_string(),
         )
         .add_env_vars(env)
         .add_container_ports(container_ports(kafka_security))

…/templates/kuttl/kerberos/10-assert.yaml …mplates/kuttl/kerberos/10-assert.yaml.j2tests/templates/kuttl/kerberos/10-assert.yaml renamed to tests/templates/kuttl/kerberos/10-assert.yaml.j2 tests/templates/kuttl/kerberos/10-assert.yaml renamed to tests/templates/kuttl/kerberos/10-assert.yaml.j2

@@ -1,3 +1,4 @@
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
@@ -10,3 +11,4 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
+{% endif %}

tests/templates/kuttl/kerberos/10-install-zk.yaml.j2

@@ -1,3 +1,4 @@
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
 ---
 apiVersion: zookeeper.stackable.tech/v1alpha1
 kind: ZookeeperCluster
@@ -18,3 +19,4 @@ spec:
     roleGroups:
       default:
         replicas: 1
+{% endif %}

tests/templates/kuttl/kerberos/20-assert.yaml

@@ -0,0 +1,22 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+timeout: 600
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-broker-default
+status:
+  readyReplicas: 3
+  replicas: 3
+{% if test_scenario['values']['use-kraft-controller'] == 'true' %}
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-kafka-controller-default
+status:
+  readyReplicas: 3
+  replicas: 3
+{% endif %}

tests/templates/kuttl/kerberos/20-assert.yaml.j2

@@ -36,14 +36,24 @@ commands:
 {% endif %}
           pullPolicy: IfNotPresent
         clusterConfig:
-          zookeeperConfigMapName: test-kafka-znode
           authentication:
             - authenticationClass: kerberos-auth-$NAMESPACE
           tls:
             # Kerberos requires the use of server and internal TLS!
             serverSecretClass: tls
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
           vectorAggregatorConfigMapName: vector-aggregator-discovery
+{% endif %}
+{% if test_scenario['values']['use-kraft-controller'] == 'false' %}
+          zookeeperConfigMapName: test-kafka-znode
+{% else %}
+        controllers:
+          config:
+            logging:
+              enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
+          roleGroups:
+            default:
+              replicas: 3
 {% endif %}
         brokers:
           config:

tests/templates/kuttl/kerberos/20-install-kafka.yaml.j2

@@ -120,6 +120,7 @@ tests:
       - openshift
       - broker-listener-class
       - bootstrap-listener-class
+      - use-kraft-controller
 
 suites:
   - name: nightly