fix: Child apps should not affect parent app's health by default (arg…

…oproj#153) Signed-off-by: Keith Chong <kykchong@redhat.com>
trown · Oct 3, 2020 · 3a3f6a3 · 3a3f6a3
1 parent d25b8fd
commit 3a3f6a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/pkg/health/health.go b/pkg/health/health.go
@@ -115,8 +115,6 @@ func GetResourceHealth(obj *unstructured.Unstructured, healthOverride HealthOver
 		}
 	case "argoproj.io":
 		switch gvk.Kind {
-		case "Application":
-			health = getApplicationHealth(obj)
 		case "Workflow":
 			health, err = getArgoWorkflowHealth(obj)
 		}
@@ -257,12 +255,6 @@ func init() {
 	_ = apiregistrationv1beta1.SchemeBuilder.AddToScheme(scheme.Scheme)
 }
 
-func getApplicationHealth(obj *unstructured.Unstructured) *HealthStatus {
-	status, _, _ := unstructured.NestedString(obj.Object, "status", "health", "status")
-	message, _, _ := unstructured.NestedString(obj.Object, "status", "health", "message")
-	return &HealthStatus{Status: HealthStatusCode(status), Message: message}
-}
-
 func getDaemonSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {
 	daemon := &appsv1.DaemonSet{}
 	err := scheme.Scheme.Convert(obj, daemon, nil)

diff --git a/pkg/health/health_test.go b/pkg/health/health_test.go
@@ -91,8 +91,8 @@ func TestPod(t *testing.T) {
 }
 
 func TestApplication(t *testing.T) {
-	assertAppHealth(t, "./testdata/application-healthy.yaml", HealthStatusHealthy)
-	assertAppHealth(t, "./testdata/application-degraded.yaml", HealthStatusDegraded)
+	assert.Nil(t, getHealthStatus("./testdata/application-healthy.yaml", t))
+	assert.Nil(t, getHealthStatus("./testdata/application-degraded.yaml", t))
 }
 
 func TestAPIService(t *testing.T) {