Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #43 - Don't setup RBAC resources for clusters with basic authentication #44

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Issue #43 - Don't setup RBAC resources for clusters with basic authentication #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmd/argocd/commands/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ func NewClusterAddCommand(clientOpts *argocdclient.ClientOptions, pathOpts *clie
conf, err := clientConfig.ClientConfig()
errors.CheckError(err)

// Install RBAC resources for managing the cluster
conf.BearerToken = common.InstallClusterManagerRBAC(conf)
if conf.Username == "" || conf.Password == "" {
// Install RBAC resources for managing the cluster if username and password are not specified
conf.BearerToken = common.InstallClusterManagerRBAC(conf)
}

conn, clusterIf := argocdclient.NewClientOrDie(clientOpts).NewClusterClientOrDie()
defer util.Close(conn)
Expand Down