Fix failure in identifying app source type when path was '.' (argopro…

…j#486)
hlj205 · Aug 1, 2018 · b0d6a70 · b0d6a70
1 parent 1fe870c
commit b0d6a70
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/util/argo/argo.go b/util/argo/argo.go
@@ -308,11 +308,13 @@ func queryAppSourceType(ctx context.Context, spec *argoappv1.ApplicationSpec, re
 		return "", err
 	}
 	for _, gitPath := range getRes.Items {
+		// gitPath may look like: app.yaml, or some/subpath/app.yaml
 		trimmedPath := strings.TrimPrefix(gitPath, spec.Source.Path)
-		if trimmedPath == "/app.yaml" {
+		trimmedPath = strings.TrimPrefix(trimmedPath, "/")
+		if trimmedPath == "app.yaml" {
 			return repository.AppSourceKsonnet, nil
 		}
-		if trimmedPath == "/Chart.yaml" {
+		if trimmedPath == "Chart.yaml" {
 			return repository.AppSourceHelm, nil
 		}
 	}