tweak test cases

adwk67 · adwk67 · commit 8b3e650b99fc · 2025-06-10T16:11:43.000+02:00
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -136,6 +136,9 @@ pub enum Error {
         port_name: String,
         port: i32,
     },
+
+    #[snafu(display("role-group is not valid"))]
+    NoRoleGroup,
 }
 
 #[versioned(version(name = "v1alpha1"))]
@@ -234,6 +237,11 @@ impl v1alpha1::HbaseCluster {
         let defaults =
             AnyConfigFragment::default_for(role, &self.name_any(), hdfs_discovery_cm_name);
 
+        // Trivial values for role-groups are not allowed
+        if role_group.is_empty() {
+            return Err(Error::NoRoleGroup);
+        }
+
         let (mut role_config, mut role_group_config) = match role {
             HbaseRole::RegionServer => {
                 let role = self
@@ -249,7 +257,9 @@ impl v1alpha1::HbaseCluster {
                     .role_groups
                     .get(role_group)
                     .map(|rg| rg.config.config.clone())
-                    .unwrap_or_default();
+                    .expect(
+                        "Cannot be empty as trivial values of role-group have already been checked",
+                    );
 
                 (
                     AnyConfigFragment::RegionServer(role_config),
@@ -271,7 +281,9 @@ impl v1alpha1::HbaseCluster {
                     .role_groups
                     .get(role_group)
                     .map(|rg| rg.config.config.clone())
-                    .unwrap_or_default();
+                    .expect(
+                        "Cannot be empty as trivial values of role-group have already been checked",
+                    );
 
                 // Retrieve role resource config
                 (
@@ -291,7 +303,9 @@ impl v1alpha1::HbaseCluster {
                     .role_groups
                     .get(role_group)
                     .map(|rg| rg.config.config.clone())
-                    .unwrap_or_default();
+                    .expect(
+                        "Cannot be empty as trivial values of role-group have already been checked",
+                    );
 
                 // Retrieve role resource config
                 (
diff --git a/rust/operator-binary/src/discovery.rs b/rust/operator-binary/src/discovery.rs
@@ -121,10 +121,7 @@ pub fn build_endpoint_configmap(
             } = podref
             {
                 if let Some(ui_port) = ports.get(&hbase.ui_port_name()) {
-                    cmm.add_data(
-                        format!("{pod_name}.http"),
-                        format!("{fqdn_override}:{ui_port}"),
-                    );
+                    cmm.add_data(pod_name, format!("{fqdn_override}:{ui_port}"));
                 }
             }
         }
diff --git a/tests/templates/kuttl/external-access/03-assert.yaml b/tests/templates/kuttl/external-access/03-assert.yaml
@@ -6,39 +6,39 @@ timeout: 600
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-hbase-master-default
+  name: test-hbase-master-external-unstable
 status:
   readyReplicas: 2
   replicas: 2
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-hbase-regionserver-default
+  name: test-hbase-regionserver-external-unstable
 status:
   readyReplicas: 1
   replicas: 1
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-hbase-regionserver-cluster-internal
+  name: test-hbase-regionserver-external-stable
 status:
   readyReplicas: 1
   replicas: 1
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-hbase-restserver-default
+  name: test-hbase-restserver-external-unstable
 status:
   readyReplicas: 1
   replicas: 1
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: test-hbase-restserver-external-unstable
+  name: test-hbase-restserver-external-stable
 status:
   readyReplicas: 1
   replicas: 1
diff --git a/tests/templates/kuttl/external-access/03-install-hbase.yaml.j2 b/tests/templates/kuttl/external-access/03-install-hbase.yaml.j2
@@ -25,7 +25,7 @@ spec:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
       listenerClass: external-unstable
     roleGroups:
-      default:
+      external-unstable:
         replicas: 2
   regionServers:
     config:
@@ -34,20 +34,20 @@ spec:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
       listenerClass: external-unstable
     roleGroups:
-      default:
+      external-unstable:
         replicas: 1
-      cluster-internal:
+      external-stable:
         replicas: 1
         config:
-          listenerClass: cluster-internal
+          listenerClass: external-stable
   restServers:
     config:
       gracefulShutdownTimeout: 1m
       logging:
         enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
-      listenerClass: cluster-internal
+      listenerClass: external-stable
     roleGroups:
-      default:
+      external-stable:
         replicas: 1
       external-unstable:
         replicas: 1
diff --git a/tests/templates/kuttl/external-access/30-access-hbase.txt.j2 b/tests/templates/kuttl/external-access/30-access-hbase.txt.j2
@@ -23,22 +23,32 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: test-hbase-ui-endpoints
-                  key: test-hbase-master-default-0.http
+                  key: test-hbase-master-external-unstable-0
             - name: MASTER_UI_1
               valueFrom:
                 configMapKeyRef:
                   name: test-hbase-ui-endpoints
-                  key: test-hbase-master-default-0.http
+                  key: test-hbase-master-external-unstable-1
             - name: REGIONSERVER_UI_0
               valueFrom:
                 configMapKeyRef:
                   name: test-hbase-ui-endpoints
-                  key: test-hbase-regionserver-default-0.http
+                  key: test-hbase-regionserver-external-stable-0
+            - name: REGIONSERVER_UI_1
+              valueFrom:
+                configMapKeyRef:
+                  name: test-hbase-ui-endpoints
+                  key: test-hbase-regionserver-external-unstable-0
             - name: RESTSERVER_UI_0
               valueFrom:
                 configMapKeyRef:
                   name: test-hbase-ui-endpoints
-                  key: test-hbase-restserver-external-unstable-0.http
+                  key: test-hbase-restserver-external-stable-0
+            - name: RESTSERVER_UI_1
+              valueFrom:
+                configMapKeyRef:
+                  name: test-hbase-ui-endpoints
+                  key: test-hbase-restserver-external-unstable-0
           volumeMounts:
             - name: script
               mountPath: /tmp/script
@@ -69,7 +79,13 @@ data:
     echo "Attempting to reach region-server at $REGIONSERVER_UI_0..."
     curl --retry 0 -f -s -o /dev/null -w "%{http_code}" "${REGIONSERVER_UI_0}" | grep 200
 
+    echo "Attempting to reach region-server at $REGIONSERVER_UI_1..."
+    curl --retry 0 -f -s -o /dev/null -w "%{http_code}" "${REGIONSERVER_UI_1}" | grep 200
+
     echo "Attempting to reach rest-server at $RESTSERVER_UI_0..."
     curl --retry 0 -f -s -o /dev/null -w "%{http_code}" "${RESTSERVER_UI_0}" | grep 200
 
+    echo "Attempting to reach rest-server at $RESTSERVER_UI_1..."
+    curl --retry 0 -f -s -o /dev/null -w "%{http_code}" "${RESTSERVER_UI_1}" | grep 200
+
     echo "All tests successful!"

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,7 @@ pub fn build_endpoint_configmap(`
`121`	`121`	`} = podref`
`122`	`122`	`{`
`123`	`123`	`if let Some(ui_port) = ports.get(&hbase.ui_port_name()) {`
`124`		`- cmm.add_data(`
`125`		`- format!("{pod_name}.http"),`
`126`		`- format!("{fqdn_override}:{ui_port}"),`
`127`		`- );`
	`124`	`+ cmm.add_data(pod_name, format!("{fqdn_override}:{ui_port}"));`
`128`	`125`	`}`
`129`	`126`	`}`
`130`	`127`	`}`