Fixed agent operator to publish to the correct namespace (#728)

Issue #726
eidolon-ai · Sep 9, 2024 · 77a0878 · 77a0878
1 parent 506513c
commit 77a0878
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/k8s-operator/internal/controller/agent_controller.go b/k8s-operator/internal/controller/agent_controller.go
@@ -49,17 +49,17 @@ func (r *AgentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl
 	if err != nil {
 		if errors.IsNotFound(err) {
 			// The Agent was deleted, we need to update the ConfigMap
-			return r.updateConfigMap(ctx)
+			return r.updateConfigMap(ctx, req.Namespace)
 		}
 		logger.Error(err, "Unable to fetch Agent")
 		return ctrl.Result{}, err
 	}
 
 	// Update the ConfigMap with all Agents
-	return r.updateConfigMap(ctx)
+	return r.updateConfigMap(ctx, req.Namespace)
 }
 
-func (r *AgentReconciler) updateConfigMap(ctx context.Context) (ctrl.Result, error) {
+func (r *AgentReconciler) updateConfigMap(ctx context.Context, namespace string) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
 	// List all Agents
@@ -106,7 +106,7 @@ func (r *AgentReconciler) updateConfigMap(ctx context.Context) (ctrl.Result, err
 	cm := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "eidolon-agent-cm",
-			Namespace: "default", // You might want to make this configurable
+			Namespace: namespace,
 		},
 		Data: map[string]string{
 			"agents.yaml": agentsYAML.String(),
@@ -116,7 +116,7 @@ func (r *AgentReconciler) updateConfigMap(ctx context.Context) (ctrl.Result, err
 	foundCM := &corev1.ConfigMap{}
 	err := r.Get(ctx, types.NamespacedName{Name: cm.Name, Namespace: cm.Namespace}, foundCM)
 	if err != nil && errors.IsNotFound(err) {
-		logger.Info("Creating ConfigMap", "Name", cm.Name)
+		logger.Info("Creating ConfigMap", "Name", cm.Name, "Namespace", cm.Namespace)
 		err = r.Create(ctx, cm)
 		if err != nil {
 			logger.Error(err, "Failed to create ConfigMap")
@@ -128,7 +128,7 @@ func (r *AgentReconciler) updateConfigMap(ctx context.Context) (ctrl.Result, err
 	} else {
 		// Update the existing ConfigMap
 		foundCM.Data = cm.Data
-		logger.Info("Updating ConfigMap", "Name", cm.Name)
+		logger.Info("Updating ConfigMap", "Name", cm.Name, "Namespace", cm.Namespace)
 		err = r.Update(ctx, foundCM)
 		if err != nil {
 			logger.Error(err, "Failed to update ConfigMap")

diff --git a/k8s-operator/internal/controller/agent_controller_test.go b/k8s-operator/internal/controller/agent_controller_test.go
@@ -21,7 +21,7 @@ var _ = Describe("Agent Reconciler", func() {
 	Context("When reconciling Agents", func() {
 		const (
 			agentName     = "test-agent"
-			namespace     = "default"
+			namespace     = "foobar"
 			configMapName = "eidolon-agent-cm"
 		)
 
@@ -32,6 +32,7 @@ var _ = Describe("Agent Reconciler", func() {
 		}
 
 		BeforeEach(func() {
+			Expect(createNamespaceIfNotExists(ctx, namespace)).To(Succeed())
 			// Create a test Agent
 			agent := &serverv1alpha1.Agent{
 				ObjectMeta: metav1.ObjectMeta{

diff --git a/k8s-operator/internal/controller/machine_controller_test.go b/k8s-operator/internal/controller/machine_controller_test.go
@@ -69,8 +69,10 @@ var _ = Describe("Machine Controller", func() {
 		mgrCtx, mgrCancel = context.WithCancel(ctx)
 
 		go func() {
+			defer GinkgoRecover()
 			err := mgr.Start(mgrCtx)
 			if err != nil {
+				GinkgoWriter.Printf("Error starting server: %v\n", err)
 				Expect(err).NotTo(HaveOccurred())
 			}
 		}()

diff --git a/k8s-operator/internal/controller/reference_controller.go b/k8s-operator/internal/controller/reference_controller.go
@@ -49,17 +49,17 @@ func (r *ReferenceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	if err != nil {
 		if errors.IsNotFound(err) {
 			// The Reference was deleted, we need to update the ConfigMap
-			return r.updateConfigMap(ctx)
+			return r.updateConfigMap(ctx, req.NamespacedName.Namespace)
 		}
 		logger.Error(err, "Unable to fetch Reference")
 		return ctrl.Result{}, err
 	}
 
 	// Update the ConfigMap with all References
-	return r.updateConfigMap(ctx)
+	return r.updateConfigMap(ctx, req.NamespacedName.Namespace)
 }
 
-func (r *ReferenceReconciler) updateConfigMap(ctx context.Context) (ctrl.Result, error) {
+func (r *ReferenceReconciler) updateConfigMap(ctx context.Context, namespace string) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 
 	// List all References
@@ -106,7 +106,7 @@ func (r *ReferenceReconciler) updateConfigMap(ctx context.Context) (ctrl.Result,
 	cm := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "eidolon-reference-cm",
-			Namespace: "default", // You might want to make this configurable
+			Namespace: namespace,
 		},
 		Data: map[string]string{
 			"references.yaml": referencesYAML.String(),

diff --git a/k8s-operator/internal/controller/reference_controller_test.go b/k8s-operator/internal/controller/reference_controller_test.go
@@ -19,7 +19,7 @@ var _ = Describe("Reference Reconciler", func() {
 	Context("When reconciling References", func() {
 		const (
 			referenceName = "test-reference"
-			namespace     = "default"
+			namespace     = "foobar"
 			configMapName = "eidolon-reference-cm"
 		)
 
@@ -30,6 +30,7 @@ var _ = Describe("Reference Reconciler", func() {
 		}
 
 		BeforeEach(func() {
+			Expect(createNamespaceIfNotExists(ctx, namespace)).To(Succeed())
 			// Create a test Reference
 			reference := &serverv1alpha1.Reference{
 				ObjectMeta: metav1.ObjectMeta{