Address review comments

Signed-off-by: Weiqiang TANG <weiqiangt@vmware.com>

build/yamls/antrea-ipsec.yml

@@ -332,8 +332,6 @@ spec:
       - args:
         - --config
         - /etc/antrea/antrea-controller.conf
-        - -v
-        - "1000"
         command:
         - antrea-controller
         env:

build/yamls/antrea.yml

@@ -323,8 +323,6 @@ spec:
       - args:
         - --config
         - /etc/antrea/antrea-controller.conf
-        - -v
-        - "1000"
         command:
         - antrea-controller
         env:

build/yamls/base/controller.yml

@@ -62,7 +62,7 @@ spec:
         - name: antrea-controller
           image: antrea
           command: ["antrea-controller"]
-          args: ["--config", "/etc/antrea/antrea-controller.conf", "-v", "1000"]
+          args: ["--config", "/etc/antrea/antrea-controller.conf"]
           env:
             # Provide pod and node information for clusterinformation CRD.
             - name: POD_NAME

cmd/antctl/main.go

@@ -42,8 +42,7 @@ var rootCmd = &cobra.Command{
 
 func init() {
 	// prevent any unexpected output at beginning
-	flag.Set("logtostderr", "true")
-	flag.Set("alsologtostderr", "true")
+	flag.Set("logtostderr", "false")
 	flag.Set("v", "0")
 	pflag.CommandLine.MarkHidden("log-flush-frequency")
 }

pkg/antctl/client.go

@@ -48,7 +48,7 @@ type RequestOption struct {
 
 // client issues requests to an antctl server and gets the response.
 type client struct {
-	// inPod tells the running mode of the client.
+	// inPod indicate whether the client is running in a pod or not.
 	inPod bool
 	// codec is the CodecFactory for this command, it is needed for remote accessing.
 	codec serializer.CodecFactory
@@ -57,7 +57,7 @@ type client struct {
 // resolveKubeconfig tries to load the kubeconfig specified in the RequestOption.
 // It will return error if the stating of the file failed or the kubeconfig is malformed.
 // It will not try to look up InCluster configuration. If the kubeconfig is loaded,
-// The groupVersion and the codec in the RequestOption will be populated into the
+// the groupVersion and the codec in the RequestOption will be populated into the
 // kubeconfig object.
 func (c *client) resolveKubeconfig(opt *RequestOption) (*rest.Config, error) {
 	kubeconfig, err := clientcmd.BuildConfigFromFlags("", opt.Kubeconfig)
@@ -108,7 +108,7 @@ func (c *client) localRequest(opt *RequestOption) (io.Reader, error) {
 // data.
 func (c *client) Request(opt *RequestOption) (io.Reader, error) {
 	if c.inPod {
-		klog.Infoln("Antctl runs as local mode")
+		klog.Infoln("antctl runs as local mode")
 		return c.localRequest(opt)
 	}
 	kubeconfig, err := c.resolveKubeconfig(opt)

pkg/antctl/command_definition.go

@@ -48,7 +48,7 @@ const (
 // antctl framework will generate a same name sub-command of the root command for
 // each of them, any commands specified as one of these group will need to be invoked
 // as:
-//  antctl <commandGroup> <command>
+//   antctl <commandGroup> <command>
 type commandGroup uint
 
 const (
@@ -164,7 +164,7 @@ func (cd *commandDefinition) applySubCommandToRoot(root *cobra.Command, client *
 // validate checks if the commandDefinition is valid.
 func (cd *commandDefinition) validate() []error {
 	var errs []error
-	if len(cd.Use) == 0 { // must have a use string
+	if len(cd.Use) == 0 {
 		errs = append(errs, fmt.Errorf("the command does not have name"))
 	}
 	if cd.TransformedResponse == nil {

pkg/antctl/command_list.go

@@ -46,9 +46,9 @@ func (cl *commandList) InstallToAPIServer(apiServer *server.GenericAPIServer, cq
 }
 
 // applyToMux adds the handler function of each commandDefinition in the
-// commandList to the mux with path /<api prefix>/<cmd>, it also adds a dummy discovery
-// handler with path /<api prefix>. It sets up a discovery handler for the
-// service available checking of the kubernetes apiserver.
+// commandList to the mux with path /apis/<group_version>/<cmd>. It also adds
+// corresponding discovery handlers at /apis/<group_version> for kubernetes service
+// discovery.
 func (cl *commandList) applyToMux(mux *mux.PathRecorderMux, aq monitor.AgentQuerier, cq monitor.ControllerQuerier) {
 	resources := map[string][]metav1.APIResource{}
 	for _, def := range cl.definitions {
@@ -100,8 +100,8 @@ func (cl *commandList) applyFlagsToRootCommand(root *cobra.Command) {
 	root.PersistentFlags().DurationP("timeout", "t", 0, "time limit of the execution of the command")
 }
 
-// ApplyToRootCommand applies the commandList to the root cobra applySubCommandToRoot, it applies
-// each commandDefinition of it to the root applySubCommandToRoot as a sub-applySubCommandToRoot.
+// ApplyToRootCommand applies the commandList to the root cobra command, it applies
+// each commandDefinition of it to the root command as a sub-command.
 func (cl *commandList) ApplyToRootCommand(root *cobra.Command, isAgent bool, inPod bool) {
 	client := &client{
 		inPod: inPod,
@@ -116,6 +116,7 @@ func (cl *commandList) ApplyToRootCommand(root *cobra.Command, isAgent bool, inP
 			continue
 		}
 		def.applySubCommandToRoot(root, client, isAgent)
+		klog.Infof("Added command %s", def.Use)
 	}
 	cl.applyFlagsToRootCommand(root)
 	root.PersistentPreRunE = func(cmd *cobra.Command, args []string) error {
@@ -127,10 +128,6 @@ func (cl *commandList) ApplyToRootCommand(root *cobra.Command, isAgent bool, inP
 		if err != nil {
 			return err
 		}
-		err = flag.Set("alsologtostderr", fmt.Sprint(enableVerbose))
-		if err != nil {
-			return err
-		}
 		if enableVerbose {
 			err := flag.Set("v", fmt.Sprint(math.MaxInt32))
 			if err != nil {
@@ -145,10 +142,10 @@ func (cl *commandList) ApplyToRootCommand(root *cobra.Command, isAgent bool, inP
 // validate checks the validation of the commandList.
 func (cl *commandList) validate() []error {
 	var errs []error
-	if len(cl.definitions) == 0 { // must have at least one applySubCommandToRoot
+	if len(cl.definitions) == 0 {
 		return []error{fmt.Errorf("no command found in the command list")}
 	}
-	for i, c := range cl.definitions { // each commandDefinition must be valid
+	for i, c := range cl.definitions {
 		for _, err := range c.validate() {
 			errs = append(errs, fmt.Errorf("#%d command<%s>: %w", i, c.Use, err))
 		}