From b092e1bc7dc73a8c2c41c0a412c71e5056db4047 Mon Sep 17 00:00:00 2001 From: Jesse Suen Date: Mon, 9 Jul 2018 13:53:45 -0700 Subject: [PATCH] Remove unnecessary role privileges from api server (resolves #319). Fix linting issues (#359) --- cmd/argocd/commands/app.go | 16 ++------------ install/manifests/04b_argocd-server-role.yaml | 21 ------------------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index 86f5e5517f..2e5bc34f37 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -188,7 +188,7 @@ func NewApplicationGetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com fmt.Println() w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) printAppResources(w, app, showOperation) - w.Flush() + _ = w.Flush() } default: log.Fatalf("Unknown output format: %s", output) @@ -805,7 +805,7 @@ func NewApplicationSyncCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co fmt.Println() w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) printAppResources(w, app, true) - w.Flush() + _ = w.Flush() } pruningRequired := 0 @@ -1022,18 +1022,6 @@ func printOperationResult(opState *argoappv1.OperationState) { } } -func printHooks(opState *argoappv1.OperationState) { - if len(opState.HookResources) > 0 { - fmt.Printf("\n") - w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0) - fmt.Fprintf(w, "HOOK\tKIND\tNAME\tSTATUS\tMESSAGE\n") - for _, hookStatus := range opState.HookResources { - fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", hookStatus.Type, hookStatus.Kind, hookStatus.Name, hookStatus.Status, hookStatus.Message) - } - _ = w.Flush() - } -} - // NewApplicationManifestsCommand returns a new instance of an `argocd app manifests` command func NewApplicationManifestsCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command { var ( diff --git a/install/manifests/04b_argocd-server-role.yaml b/install/manifests/04b_argocd-server-role.yaml index b442837aa3..56d4fd5492 100644 --- a/install/manifests/04b_argocd-server-role.yaml +++ b/install/manifests/04b_argocd-server-role.yaml @@ -3,31 +3,10 @@ kind: Role metadata: name: argocd-server-role rules: -- apiGroups: - - "" - resources: - - pods - - pods/exec - - pods/log - verbs: - - get - - list - - watch - apiGroups: - "" resources: - secrets - verbs: - - create - - get - - list - - watch - - update - - patch - - delete -- apiGroups: - - "" - resources: - configmaps verbs: - create