taking out comments for pr push

Author: Cameron Wright

pkg/util/client/common.go

@@ -37,20 +37,20 @@ func UseSSL(cluster *v1beta1.KafkaCluster) bool {
 
 func getContainerPortForInnerCom(internalListeners []v1beta1.InternalListenerConfig, extListeners []v1beta1.ExternalListenerConfig) int32 {
 	for _, val := range internalListeners {
-		// if val.UsedForKafkaAdminCommunication { // Cannot Currently update the CRD as I do not have permissions
-		// 	return val.ContainerPort
-		// }
+		if val.UsedForKafkaAdminCommunication { // Cannot Currently update the CRD as I do not have permissions
+			return val.ContainerPort
+		}
 		if val.UsedForInnerBrokerCommunication {
 			return val.ContainerPort
 		}
 	}
 
 	for _, val := range extListeners {
-		// if val.UsedForKafkaAdminCommunication {
-		// 	return val.ContainerPort
-		// }
+		if val.UsedForKafkaAdminCommunication {
+			return val.ContainerPort
+		}
 		if val.UsedForInnerBrokerCommunication {
-			return 29092 // this is a temporary workaround
+			return val.ContainerPort
 		}
 	}
 	return 0

pkg/util/kafka/common.go

@@ -193,21 +193,23 @@ func GetBootstrapServersService(cluster *v1beta1.KafkaCluster) (string, error) {
 func GetBrokerContainerPort(cluster *v1beta1.KafkaCluster) (int32, error) {
 	containerPort := int32(0)
 	for _, lc := range cluster.Spec.ListenersConfig.InternalListeners {
-		// if lc.UsedForKafkaAdminCommunication { // Cannot Currently update the CRD as I do not have permissions
-		// 	return val.ContainerPort
-		// }
+		if lc.UsedForKafkaAdminCommunication { // Cannot Currently update the CRD as I do not have permissions
+			containerPort = lc.ContainerPort
+			break
+		}
 		if lc.UsedForInnerBrokerCommunication && !lc.UsedForControllerCommunication {
 			containerPort = lc.ContainerPort
 			break
 		}
 	}
 
 	for _, lc := range cluster.Spec.ListenersConfig.ExternalListeners {
-		// if lc.UsedForKafkaAdminCommunication { // Cannot Currently update the CRD as I do not have permissions
-		// 	return val.ContainerPort
-		// }
+		if lc.UsedForKafkaAdminCommunication { // Cannot Currently update the CRD as I do not have permissions
+			containerPort = lc.ContainerPort
+			break
+		}
 		if lc.UsedForInnerBrokerCommunication {
-			containerPort = 29092 // temporary solution, needs to be reverted
+			containerPort = lc.ContainerPort
 			break
 		}
 	}