Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 01:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: Support argocd app diff --local and argocd app sync --local with custom plugins (#3733)

Browse source 
* settingsMgr returns plugins list When login successful or When API server DisableAuth
This commit is contained in:
May Zhang 2020-06-09 14:06:49 -07:00 committed by GitHub
parent 4032e8efd7
commit 10dc082404
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/server.go
View file

@ -512,7 +512,7 @@ func (a *ArgoCDServer) newGRPCServer() *grpc.Server {
projectLock := util.NewKeyLock()
applicationService := application.NewServer(a.Namespace, a.KubeClientset, a.AppClientset, a.appLister, a.RepoClientset, a.Cache, kubectl, db, a.enf, projectLock, a.settingsMgr)
projectService := project.NewServer(a.Namespace, a.KubeClientset, a.AppClientset, a.enf, projectLock, a.sessionMgr, a.policyEnforcer)
settingsService := settings.NewServer(a.settingsMgr, a)
settingsService := settings.NewServer(a.settingsMgr, a, a.DisableAuth)
accountService := account.NewServer(a.sessionMgr, a.settingsMgr, a.enf)
certificateService := certificate.NewServer(a.RepoClientset, db, a.enf)
versionpkg.RegisterVersionServiceServer(grpcS, &version.Server{})

7
server/settings/settings.go
View file

@ -15,6 +15,7 @@ import (
type Server struct {
mgr *settings.SettingsManager
authenticator Authenticator
disableAuth bool
}
type Authenticator interface {
@ -22,8 +23,8 @@ type Authenticator interface {
}
// NewServer returns a new instance of the Settings service
func NewServer(mgr *settings.SettingsManager, authenticator Authenticator) *Server {
return &Server{mgr: mgr, authenticator: authenticator}
func NewServer(mgr *settings.SettingsManager, authenticator Authenticator, disableAuth bool) *Server {
return &Server{mgr: mgr, authenticator: authenticator, disableAuth: disableAuth}
}
// Get returns Argo CD settings
@ -99,7 +100,7 @@ func (s *Server) Get(ctx context.Context, q *settingspkg.SettingsQuery) (*settin
KustomizeVersions: kustomizeVersions,
}
if sessionmgr.LoggedIn(ctx) {
if sessionmgr.LoggedIn(ctx) || s.disableAuth {
configManagementPlugins, err := s.mgr.GetConfigManagementPlugins()
if err != nil {
return nil, err