From 33e55972f42d9444cd7c6d3150559a30d9bf7613 Mon Sep 17 00:00:00 2001 From: xilabao Date: Fri, 31 Mar 2017 18:03:59 +0800 Subject: [PATCH] use StringArray in create rolebindings --- pkg/kubectl/cmd/create_clusterrolebinding.go | 12 ++++++------ pkg/kubectl/cmd/create_rolebinding.go | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/kubectl/cmd/create_clusterrolebinding.go b/pkg/kubectl/cmd/create_clusterrolebinding.go index 619dc94621f..88262f23580 100644 --- a/pkg/kubectl/cmd/create_clusterrolebinding.go +++ b/pkg/kubectl/cmd/create_clusterrolebinding.go @@ -54,9 +54,9 @@ func NewCmdCreateClusterRoleBinding(f cmdutil.Factory, cmdOut io.Writer) *cobra. cmdutil.AddPrinterFlags(cmd) cmdutil.AddGeneratorFlags(cmd, cmdutil.ClusterRoleBindingV1GeneratorName) cmd.Flags().String("clusterrole", "", i18n.T("ClusterRole this ClusterRoleBinding should reference")) - cmd.Flags().StringSlice("user", []string{}, "usernames to bind to the role") - cmd.Flags().StringSlice("group", []string{}, "groups to bind to the role") - cmd.Flags().StringSlice("serviceaccount", []string{}, "service accounts to bind to the role") + cmd.Flags().StringArray("user", []string{}, "usernames to bind to the role") + cmd.Flags().StringArray("group", []string{}, "groups to bind to the role") + cmd.Flags().StringArray("serviceaccount", []string{}, "service accounts to bind to the role, in the format :") return cmd } @@ -72,9 +72,9 @@ func CreateClusterRoleBinding(f cmdutil.Factory, cmdOut io.Writer, cmd *cobra.Co generator = &kubectl.ClusterRoleBindingGeneratorV1{ Name: name, ClusterRole: cmdutil.GetFlagString(cmd, "clusterrole"), - Users: cmdutil.GetFlagStringSlice(cmd, "user"), - Groups: cmdutil.GetFlagStringSlice(cmd, "group"), - ServiceAccounts: cmdutil.GetFlagStringSlice(cmd, "serviceaccount"), + Users: cmdutil.GetFlagStringArray(cmd, "user"), + Groups: cmdutil.GetFlagStringArray(cmd, "group"), + ServiceAccounts: cmdutil.GetFlagStringArray(cmd, "serviceaccount"), } default: return cmdutil.UsageError(cmd, fmt.Sprintf("Generator: %s not supported.", generatorName)) diff --git a/pkg/kubectl/cmd/create_rolebinding.go b/pkg/kubectl/cmd/create_rolebinding.go index f4ae18e97e4..3509c4667e4 100644 --- a/pkg/kubectl/cmd/create_rolebinding.go +++ b/pkg/kubectl/cmd/create_rolebinding.go @@ -55,9 +55,9 @@ func NewCmdCreateRoleBinding(f cmdutil.Factory, cmdOut io.Writer) *cobra.Command cmdutil.AddGeneratorFlags(cmd, cmdutil.RoleBindingV1GeneratorName) cmd.Flags().String("clusterrole", "", i18n.T("ClusterRole this RoleBinding should reference")) cmd.Flags().String("role", "", i18n.T("Role this RoleBinding should reference")) - cmd.Flags().StringSlice("user", []string{}, "usernames to bind to the role") - cmd.Flags().StringSlice("group", []string{}, "groups to bind to the role") - cmd.Flags().StringSlice("serviceaccount", []string{}, "service accounts to bind to the role") + cmd.Flags().StringArray("user", []string{}, "usernames to bind to the role") + cmd.Flags().StringArray("group", []string{}, "groups to bind to the role") + cmd.Flags().StringArray("serviceaccount", []string{}, "service accounts to bind to the role, in the format :") return cmd } @@ -73,9 +73,9 @@ func CreateRoleBinding(f cmdutil.Factory, cmdOut io.Writer, cmd *cobra.Command, Name: name, ClusterRole: cmdutil.GetFlagString(cmd, "clusterrole"), Role: cmdutil.GetFlagString(cmd, "role"), - Users: cmdutil.GetFlagStringSlice(cmd, "user"), - Groups: cmdutil.GetFlagStringSlice(cmd, "group"), - ServiceAccounts: cmdutil.GetFlagStringSlice(cmd, "serviceaccount"), + Users: cmdutil.GetFlagStringArray(cmd, "user"), + Groups: cmdutil.GetFlagStringArray(cmd, "group"), + ServiceAccounts: cmdutil.GetFlagStringArray(cmd, "serviceaccount"), } default: return cmdutil.UsageError(cmd, fmt.Sprintf("Generator: %s not supported.", generatorName))