diff --git a/server/application/application.go b/server/application/application.go index 2bb19fc86beb7..4a34200806665 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -3,6 +3,7 @@ package application import ( "bufio" "encoding/json" + "fmt" "path" "reflect" "strings" @@ -69,7 +70,7 @@ func NewServer( // appRBACName formats fully qualified application name for RBAC check func appRBACName(app appv1.Application) string { - return path.Join(git.NormalizeGitURL(app.Spec.Source.RepoURL), app.Name) + return fmt.Sprintf("%s/%s", git.NormalizeGitURL(app.Spec.Source.RepoURL), app.Name) } // List returns list of applications diff --git a/util/argo/argo.go b/util/argo/argo.go index 18e7da039381a..b3f553bb4cdc7 100644 --- a/util/argo/argo.go +++ b/util/argo/argo.go @@ -21,6 +21,11 @@ func RefreshApp(appIf v1alpha1.ApplicationInterface, name string) (*argoappv1.Ap common.AnnotationKeyRefresh: refreshString, }, }, + "status": map[string]interface{}{ + "comparisonResult": map[string]interface{}{ + "comparedAt": nil, + }, + }, } var err error patch, err := json.Marshal(metadata)