From cbc8641c8ab7cbce1b10b93839a26eb8571bc7a4 Mon Sep 17 00:00:00 2001
From: Kamil Chociej <kamil.chociej@ds.pl>
Date: Mon, 20 Jan 2025 13:36:52 +0100
Subject: [PATCH 1/2] Zookeeper metrics port registration

---
 .../controllers/zookeeper/ZooKeeperResourcesFactory.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/operator/src/main/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperResourcesFactory.java b/operator/src/main/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperResourcesFactory.java
index bac1e156..17ec8374 100644
--- a/operator/src/main/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperResourcesFactory.java
+++ b/operator/src/main/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperResourcesFactory.java
@@ -62,6 +62,7 @@ public class ZooKeeperResourcesFactory extends BaseResourcesFactory<ZooKeeperSpe
     public static final int DEFAULT_LEADER_ELECTION_PORT = 3888;
     public static final int DEFAULT_CLIENT_PORT = 2181;
     public static final int DEFAULT_CLIENT_TLS_PORT = 2281;
+    public static final int DEFAULT_METRICS_PORT = 8000;
     public static final String ENV_ZOOKEEPER_SERVERS = "ZOOKEEPER_SERVERS";
     public static final List<String> DEFAULT_ENV = List.of("ZOOKEEPER_SERVERS");
 
@@ -309,6 +310,10 @@ public void patchStatefulSet() {
                                 new ContainerPortBuilder()
                                         .withName("leader-election")
                                         .withContainerPort(DEFAULT_LEADER_ELECTION_PORT)
+                                        .build(),
+                                new ContainerPortBuilder()
+                                        .withName("metrics")
+                                        .withContainerPort(DEFAULT_METRICS_PORT)
                                         .build()
                         ))
                         .withEnv(env)

From 3ca63edbe25fdb63662278925a8c4dc5f25053b7 Mon Sep 17 00:00:00 2001
From: Kamil Chociej <kamil.chociej@ds.pl>
Date: Mon, 20 Jan 2025 13:51:26 +0100
Subject: [PATCH 2/2] Defaults test adjustment

---
 .../oss/kaap/controllers/zookeeper/ZooKeeperControllerTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/operator/src/test/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperControllerTest.java b/operator/src/test/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperControllerTest.java
index 5a4e08c7..4fc8873f 100644
--- a/operator/src/test/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperControllerTest.java
+++ b/operator/src/test/java/com/datastax/oss/kaap/controllers/zookeeper/ZooKeeperControllerTest.java
@@ -183,6 +183,8 @@ public void testDefaults() throws Exception {
                                   name: server
                                 - containerPort: 3888
                                   name: leader-election
+                                - containerPort: 8000
+                                  name: metrics
                                 readinessProbe:
                                   exec:
                                     command: