[CORE-126251] - PR Comments Addressed

Author: Daniel Vaseekaran

config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml

@@ -19187,7 +19187,7 @@ spec:
                     type: object
                 type: object
               kRaft:
-                default: true
+                default: false
                 description: kRaft is used to decide where the Kafka cluster is under
                   KRaft mode or ZooKeeper mode. This is default to be true; if set
                   to false, the Kafka cluster is in ZooKeeper mode.

controllers/tests/kafkacluster_controller_externallistenerbindings_test.go

@@ -225,8 +225,6 @@ func expectBrokerConfigmapForAz2ExternalListener(ctx context.Context, kafkaClust
 			19092, randomGenTestNumber, 2, randomGenTestNumber, randomGenTestNumber, 2, randomGenTestNumber)
 	}
 	Expect(advertisedListener.Value()).To(Equal(expectedAdvertisedListener))
-	// Expect(advertisedListener.Value()).To(Equal(fmt.Sprintf("TEST://external.az2.host.com:%d,CONTROLLER://kafkacluster-%d-%d.kafkaconfigtest-%d.svc.cluster.local:29093,INTERNAL://kafkacluster-%d-%d.kafkaconfigtest-%d.svc.cluster.local:29092",
-	// 19092, randomGenTestNumber, 2, randomGenTestNumber, randomGenTestNumber, 2, randomGenTestNumber)))
 }
 
 func expectBrokerConfigmapForAz2ExternalListenerTls(kafkaCluster *v1beta1.KafkaCluster, randomGenTestNumber uint64) {

pkg/resources/kafka/kafka.go

@@ -248,17 +248,16 @@ func (r *Reconciler) Reconcile(log logr.Logger) error {
 		if err != nil {
 			return errors.WrapIfWithDetails(err, "failed to reconcile resource", "resource", o.GetObjectKind().GroupVersionKind())
 		}
-	}
-
-	// Handle PDB for controllers (KRaft only)
-	if r.KafkaCluster.Spec.KRaftMode && r.KafkaCluster.Spec.DisruptionBudget.Create {
-		o, err := r.podDisruptionBudgetControllers(log)
-		if err != nil {
-			return errors.WrapIfWithDetails(err, "failed to compute podDisruptionBudget for controllers")
-		}
-		err = k8sutil.Reconcile(log, r.Client, o, r.KafkaCluster)
-		if err != nil {
-			return errors.WrapIfWithDetails(err, "failed to reconcile resource", "resource", o.GetObjectKind().GroupVersionKind())
+		// Handle PDB for controllers (KRaft only)
+		if r.KafkaCluster.Spec.KRaftMode {
+			o, err := r.podDisruptionBudgetControllers(log)
+			if err != nil {
+				return errors.WrapIfWithDetails(err, "failed to compute podDisruptionBudget for controllers")
+			}
+			err = k8sutil.Reconcile(log, r.Client, o, r.KafkaCluster)
+			if err != nil {
+				return errors.WrapIfWithDetails(err, "failed to reconcile resource", "resource", o.GetObjectKind().GroupVersionKind())
+			}
 		}
 	}
 

run-local.sh

@@ -3,7 +3,7 @@
 # RUN KOPERATOR LOCALLY ON KIND
 ### Create kind cluster
 kind delete clusters e2e-kind
-kind create cluster --config=/Users/dvaseeka/Documents/adobe/kRaft-migration/pipeline-kraft-migration/koperators/koperator/tests/e2e/platforms/kind/kind_config.yaml --name=e2e-kind
+kind create cluster --config=tests/e2e/platforms/kind/kind_config.yaml --name=e2e-kind
 
 ### Build/Load images
 kind load docker-image docker-pipeline-upstream-mirror.dr-uw2.adobeitc.com/adobe/cruise-control:2.5.133-adbe-20240313 --name e2e-kind
@@ -34,4 +34,4 @@ kubectl apply -f charts/kafka-operator/crds/
 
 ### Initialize Kafka Cluster
 kubectl apply -f config/samples/kraft/simplekafkacluster_kraft.yaml -n kafka
-kubectl config set-context --current --namespace kafka 
+kubectl config set-context --current --namespace kafka