Issue argoproj#1167 - Controller should remove orphaned resources war…

…ning if app has no orphaned resources

controller/appcontroller.go

@@ -281,12 +281,14 @@ func (ctrl *ApplicationController) getResourceTree(a *appv1.Application, managed
 			}
 		}
 	}
+	var conditions []appv1.ApplicationCondition
 	if len(orphanedNodes) > 0 && warnOrphaned {
-		a.Status.SetConditions([]appv1.ApplicationCondition{{
+		conditions = []appv1.ApplicationCondition{{
 			Type:    appv1.ApplicationConditionOrphanedResourceWarning,
 			Message: fmt.Sprintf("Application has %d orphaned resources", len(orphanedNodes)),
-		}}, map[appv1.ApplicationConditionType]bool{appv1.ApplicationConditionOrphanedResourceWarning: true})
+		}}
 	}
+	a.Status.SetConditions(conditions, map[appv1.ApplicationConditionType]bool{appv1.ApplicationConditionOrphanedResourceWarning: true})
 	return &appv1.ApplicationTree{Nodes: nodes, OrphanedNodes: orphanedNodes}, nil
 }
 

test/e2e/app_management_test.go

@@ -768,5 +768,18 @@ func TestOrphanedResource(t *testing.T) {
 		}).
 		Refresh(RefreshTypeNormal).
 		Then().
-		Expect(Condition(ApplicationConditionOrphanedResourceWarning, "Application has 1 orphaned resources"))
+		Expect(Condition(ApplicationConditionOrphanedResourceWarning, "Application has 1 orphaned resources")).
+		Given().
+		ProjectSpec(AppProjectSpec{
+			SourceRepos:       []string{"*"},
+			Destinations:      []ApplicationDestination{{Namespace: "*", Server: "*"}},
+			OrphanedResources: nil,
+		}).
+		When().
+		Refresh(RefreshTypeNormal).
+		Then().
+		Expect(SyncStatusIs(SyncStatusCodeSynced)).
+		And(func(app *Application) {
+			assert.Len(t, app.Status.Conditions, 0)
+		})
 }

test/e2e/fixture/fixture.go

@@ -2,7 +2,6 @@ package fixture
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -12,8 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/types"
-
 	"github.com/argoproj/pkg/errors"
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/ghodss/yaml"
@@ -295,9 +292,10 @@ func SetHelmRepoCredential(creds settings.HelmRepoCredentials) {
 }
 
 func SetProjectSpec(project string, spec v1alpha1.AppProjectSpec) {
-	data, err := json.Marshal(spec)
+	proj, err := AppClientset.ArgoprojV1alpha1().AppProjects(ArgoCDNamespace).Get(project, v1.GetOptions{})
 	errors.CheckError(err)
-	_, err = AppClientset.ArgoprojV1alpha1().AppProjects(ArgoCDNamespace).Patch(project, types.MergePatchType, []byte(fmt.Sprintf(`{ "spec": %s }`, string(data))))
+	proj.Spec = spec
+	_, err = AppClientset.ArgoprojV1alpha1().AppProjects(ArgoCDNamespace).Update(proj)
 	errors.CheckError(err)
 }