Issue argoproj#858 - Support loading resource events for multi-networ…

…k apps (argoproj#865)
tkasuz · Dec 3, 2018 · 246392f · 246392f
1 parent 0693a6d
commit 246392f
Show file tree

Hide file tree

Showing 14 changed files with 298 additions and 243 deletions.
diff --git a/controller/services/application.pb.go b/controller/services/application.pb.go
diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go
diff --git a/reposerver/repository/repository.pb.go b/reposerver/repository/repository.pb.go
diff --git a/server/account/account.pb.go b/server/account/account.pb.go
diff --git a/server/application/application.go b/server/application/application.go
@@ -241,8 +241,9 @@ func (s *Server) ListResourceEvents(ctx context.Context, q *ApplicationResourceE
 			"involvedObject.namespace": a.Namespace,
 		}).String()
 	} else {
+		namespace = q.ResourceNamespace
 		var config *rest.Config
-		config, namespace, err = s.getApplicationClusterConfig(*q.Name)
+		config, _, err = s.getApplicationClusterConfig(*q.Name)
 		if err != nil {
 			return nil, err
 		}