move kafka.go to its own package

nasark · Oct 23, 2023 · 843154a · 843154a
1 parent 73be586
commit 843154a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.../v1alpha1/helpers/miq-components/kafka.go → ...ha1/helpers/miq-components/kafka/kafka.go b/.../v1alpha1/helpers/miq-components/kafka.go → ...ha1/helpers/miq-components/kafka/kafka.go
@@ -1,4 +1,4 @@
-package miqtools
+package miqkafka
 
 import (
 	miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"

diff --git a/manageiq-operator/internal/controller/manageiq_controller.go b/manageiq-operator/internal/controller/manageiq_controller.go
@@ -35,6 +35,7 @@ import (
 
 	miqv1alpha1 "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1"
 	cr_migration "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/cr_migration"
+	miqkafka "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components/kafka"
 	miqtool "github.com/ManageIQ/manageiq-pods/manageiq-operator/api/v1alpha1/helpers/miq-components"
 	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -524,21 +525,21 @@ func (r *ManageIQReconciler) generatePostgresqlResources(cr *miqv1alpha1.ManageI
 }
 
 func (r *ManageIQReconciler) generateKafkaResources(cr *miqv1alpha1.ManageIQ) error {
-	kafkaSubscription, mutateFunc := miqtool.KafkaInstall(cr, r.Scheme)
+	kafkaSubscription, mutateFunc := miqkafka.KafkaInstall(cr, r.Scheme)
 	if result, err := controllerutil.CreateOrUpdate(context.TODO(), r.Client, kafkaSubscription, mutateFunc); err != nil {
 		return err
 	} else if result != controllerutil.OperationResultNone {
 		logger.Info("Kafka Subscription has been reconciled", "result", result)
 	}
 
-	kafkaClusterCR, mutateFunc := miqtool.KafkaCluster(cr, r.Scheme)
+	kafkaClusterCR, mutateFunc := miqkafka.KafkaCluster(cr, r.Scheme)
 	if result, err := controllerutil.CreateOrUpdate(context.TODO(), r.Client, kafkaClusterCR, mutateFunc); err != nil {
 		return err
 	} else if result != controllerutil.OperationResultNone {
 		logger.Info("Kafka Cluster has been reconciled", "result", result)
 	}
 
-	kafkaUserCR, mutateFunc := miqtool.KafkaUser(cr, r.Scheme)
+	kafkaUserCR, mutateFunc := miqkafka.KafkaUser(cr, r.Scheme)
 	if result, err := controllerutil.CreateOrUpdate(context.TODO(), r.Client, kafkaUserCR, mutateFunc); err != nil {
 		return err
 	} else if result != controllerutil.OperationResultNone {
@@ -547,7 +548,7 @@ func (r *ManageIQReconciler) generateKafkaResources(cr *miqv1alpha1.ManageIQ) er
 
 	topics := []string{"messaging-health-check", "manageiq.ems", "manageiq.ems-events", "manageiq.ems-inventory", "manageiq.metrics"}
 	for i := 0; i < len(topics); i++ {
-		kafkaTopicCR, mutateFunc := miqtool.KafkaTopic(cr, r.Scheme, topics[i])
+		kafkaTopicCR, mutateFunc := miqkafka.KafkaTopic(cr, r.Scheme, topics[i])
 		if result, err := controllerutil.CreateOrUpdate(context.TODO(), r.Client, kafkaTopicCR, mutateFunc); err != nil {
 			return err
 		} else if result != controllerutil.OperationResultNone {