From 46d53800f172c852578ba4a51086d7ff0a41e50e Mon Sep 17 00:00:00 2001 From: Rithick Date: Mon, 11 Nov 2024 12:53:28 +0530 Subject: [PATCH] Revert "Fix Test Cases" This reverts commit b1f6c9bc32e38da2e3526456b12a8ad9fb608a71. --- .../PulsarClusterResourceGeneratorTest.java | 1 + .../bookkeeper/BookKeeperControllerTest.java | 10 ++++++++++ .../bookkeeper/BookKeeperSetsControllerTest.java | 7 +++++++ .../controllers/zookeeper/ZooKeeperControllerTest.java | 4 ++++ 4 files changed, 22 insertions(+) diff --git a/migration-tool/src/test/java/com/datastax/oss/kaap/migrationtool/PulsarClusterResourceGeneratorTest.java b/migration-tool/src/test/java/com/datastax/oss/kaap/migrationtool/PulsarClusterResourceGeneratorTest.java index 3d165db9..4daf3b90 100644 --- a/migration-tool/src/test/java/com/datastax/oss/kaap/migrationtool/PulsarClusterResourceGeneratorTest.java +++ b/migration-tool/src/test/java/com/datastax/oss/kaap/migrationtool/PulsarClusterResourceGeneratorTest.java @@ -892,6 +892,7 @@ private void assertValue(File tmpDir) { PULSAR_EXTRA_OPTS: -Dpulsar.log.root.level=info PULSAR_LOG_LEVEL: info PULSAR_LOG_ROOT_LEVEL: info + ensemblePlacementPolicy: "" zkServers: pulsar-cluster-zookeeper-ca:2181 replicas: 1 annotations: {} diff --git a/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperControllerTest.java b/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperControllerTest.java index c4ab5d5d..da74c5d4 100644 --- a/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperControllerTest.java +++ b/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperControllerTest.java @@ -259,6 +259,11 @@ public void testDefaults() throws Exception { - apiVersion: v1 kind: PersistentVolumeClaim metadata: + labels: + app: pulsar + cluster: pulsar-spec-1 + component: bookkeeper + resource-set: bookkeeper name: pulsar-spec-1-bookkeeper-journal spec: accessModes: @@ -269,6 +274,11 @@ public void testDefaults() throws Exception { - apiVersion: v1 kind: PersistentVolumeClaim metadata: + labels: + app: pulsar + cluster: pulsar-spec-1 + component: bookkeeper + resource-set: bookkeeper name: pulsar-spec-1-bookkeeper-ledgers spec: accessModes: diff --git a/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperSetsControllerTest.java b/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperSetsControllerTest.java index 2b6af695..09045f62 100644 --- a/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperSetsControllerTest.java +++ b/operator/src/test/java/com/datastax/oss/kaap/controllers/bookkeeper/BookKeeperSetsControllerTest.java @@ -376,6 +376,13 @@ private void assertResourceSetLabel(StatefulSet sts, String value) { .getRequiredDuringSchedulingIgnoredDuringExecution() .get(0) .getLabelSelector().getMatchLabels().get(CRDConstants.LABEL_RESOURCESET), value); + Assert.assertEquals( + sts.getSpec().getVolumeClaimTemplates().get(0).getMetadata().getLabels() + .get(CRDConstants.LABEL_RESOURCESET), value); + + Assert.assertEquals( + sts.getSpec().getVolumeClaimTemplates().get(1).getMetadata().getLabels() + .get(CRDConstants.LABEL_RESOURCESET), value); } 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 fac3dd41..5a4e08c7 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 @@ -212,6 +212,10 @@ public void testDefaults() throws Exception { - apiVersion: v1 kind: PersistentVolumeClaim metadata: + labels: + app: pulsar + cluster: pulsar-spec-1 + component: zookeeper name: pulsar-spec-1-zookeeper-data spec: accessModes: