Sync namespace for Event to the Application namespace (#847)

Signed-off-by: Jort Koopmans <[email protected]>
argoproj-labs · Sep 1, 2024 · fd60c85 · fd60c85
1 parent 8c9e269
commit fd60c85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/kube/kubernetes.go b/pkg/kube/kubernetes.go
@@ -96,14 +96,14 @@ func (client *KubernetesClient) GetSecretField(namespace string, secretName stri
 	}
 }
 
-// CreateApplicationevent creates a kubernetes event with a custom reason and message for an application.
+// CreateApplicationEvent creates a kubernetes event with a custom reason and message for an application.
 func (client *KubernetesClient) CreateApplicationEvent(app *appv1alpha1.Application, reason string, message string, annotations map[string]string) (*v1.Event, error) {
 	t := metav1.Time{Time: time.Now()}
 
 	event := v1.Event{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        fmt.Sprintf("%v.%x", app.ObjectMeta.Name, t.UnixNano()),
-			Namespace:   client.Namespace,
+			Namespace:   app.ObjectMeta.Namespace,
 			Annotations: annotations,
 		},
 		Source: v1.EventSource{
@@ -125,7 +125,7 @@ func (client *KubernetesClient) CreateApplicationEvent(app *appv1alpha1.Applicat
 		Reason:         reason,
 	}
 
-	result, err := client.Clientset.CoreV1().Events(client.Namespace).Create(client.Context, &event, metav1.CreateOptions{})
+	result, err := client.Clientset.CoreV1().Events(app.ObjectMeta.Namespace).Create(client.Context, &event, metav1.CreateOptions{})
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/kube/kubernetes_test.go b/pkg/kube/kubernetes_test.go
@@ -93,6 +93,6 @@ func Test_CreateApplicationEvent(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, event)
 		assert.Equal(t, "ArgocdImageUpdater", event.Source.Component)
-		assert.Equal(t, "default", client.Namespace)
+		assert.Equal(t, "argocd", event.Namespace)
 	})
 }