feat: Add controllerNamespace to .status of an application (argoproj#…

…13081) Signed-off-by: Kevin Huber <[email protected]> Signed-off-by: Michael Crenshaw <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]>
tkasuz · May 27, 2023 · 032a596 · 032a596
1 parent dfa11ae
commit 032a596
Show file tree

Hide file tree

Showing 11 changed files with 733 additions and 622 deletions.
diff --git a/assets/swagger.json b/assets/swagger.json
@@ -6345,6 +6345,10 @@
             "$ref": "#/definitions/v1alpha1ApplicationCondition"
           }
         },
+        "controllerNamespace": {
+          "type": "string",
+          "title": "ControllerNamespace indicates the namespace in which the application controller is located"
+        },
         "health": {
           "$ref": "#/definitions/v1alpha1HealthStatus"
         },

diff --git a/controller/appcontroller.go b/controller/appcontroller.go
@@ -1470,6 +1470,7 @@ func (ctrl *ApplicationController) processAppRefreshQueueItem() (processNext boo
 	})
 	app.Status.SourceType = compareResult.appSourceType
 	app.Status.SourceTypes = compareResult.appSourceTypes
+	app.Status.ControllerNamespace = ctrl.namespace
 	ctrl.persistAppStatus(origApp, &app.Status)
 	return
 }

diff --git a/controller/appcontroller_test.go b/controller/appcontroller_test.go
@@ -54,6 +54,7 @@ type fakeData struct {
 	namespacedResources    map[kube.ResourceKey]namespacedResource
 	configMapData          map[string]string
 	metricsCacheExpiration time.Duration
+	applicationNamespaces  []string
 }
 
 func newFakeController(data *fakeData) *ApplicationController {
@@ -111,7 +112,7 @@ func newFakeController(data *fakeData) *ApplicationController {
 		0,
 		true,
 		nil,
-		[]string{},
+		data.applicationNamespaces,
 	)
 	if err != nil {
 		panic(err)
@@ -1584,3 +1585,38 @@ func Test_syncDeleteOption(t *testing.T) {
 		assert.False(t, delete)
 	})
 }
+
+func TestAddControllerNamespace(t *testing.T) {
+	t.Run("set controllerNamespace when the app is in the controller namespace", func(t *testing.T) {
+		app := newFakeApp()
+		ctrl := newFakeController(&fakeData{
+			apps: []runtime.Object{app, &defaultProj},
+			manifestResponse: &apiclient.ManifestResponse{},
+		})
+
+		ctrl.processAppRefreshQueueItem()
+
+		updatedApp, err := ctrl.applicationClientset.ArgoprojV1alpha1().Applications(ctrl.namespace).Get(context.Background(), app.Name, metav1.GetOptions{})
+		assert.NoError(t, err)
+		assert.Equal(t, test.FakeArgoCDNamespace, updatedApp.Status.ControllerNamespace)
+	})
+	t.Run("set controllerNamespace when the app is in another namespace than the controller", func(t *testing.T) {
+		appNamespace := "app-namespace"
+
+		app := newFakeApp()
+		app.ObjectMeta.Namespace = appNamespace
+		proj := defaultProj
+		proj.Spec.SourceNamespaces = []string{appNamespace}
+		ctrl := newFakeController(&fakeData{
+			apps: []runtime.Object{app, &proj},
+			manifestResponse: &apiclient.ManifestResponse{},
+			applicationNamespaces: []string{appNamespace},
+		})
+
+		ctrl.processAppRefreshQueueItem()
+
+		updatedApp, err := ctrl.applicationClientset.ArgoprojV1alpha1().Applications(appNamespace).Get(context.Background(), app.Name, metav1.GetOptions{})
+		assert.NoError(t, err)
+		assert.Equal(t, test.FakeArgoCDNamespace, updatedApp.Status.ControllerNamespace)
+	})
+}
diff --git a/manifests/core-install.yaml b/manifests/core-install.yaml
@@ -1511,6 +1511,10 @@ spec:
                   - type
                   type: object
                 type: array
+              controllerNamespace:
+                description: ControllerNamespace indicates the namespace in which
+                  the application controller is located
+                type: string
               health:
                 description: Health contains information about the application's current
                   health status

diff --git a/manifests/crds/application-crd.yaml b/manifests/crds/application-crd.yaml
@@ -1510,6 +1510,10 @@ spec:
                   - type
                   type: object
                 type: array
+              controllerNamespace:
+                description: ControllerNamespace indicates the namespace in which
+                  the application controller is located
+                type: string
               health:
                 description: Health contains information about the application's current
                   health status

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -1511,6 +1511,10 @@ spec:
                   - type
                   type: object
                 type: array
+              controllerNamespace:
+                description: ControllerNamespace indicates the namespace in which
+                  the application controller is located
+                type: string
               health:
                 description: Health contains information about the application's current
                   health status

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -1511,6 +1511,10 @@ spec:
                   - type
                   type: object
                 type: array
+              controllerNamespace:
+                description: ControllerNamespace indicates the namespace in which
+                  the application controller is located
+                type: string
               health:
                 description: Health contains information about the application's current
                   health status