提交 dac43de2 编写于 作者: L liqingping

fix: generic flag parse in each subcommand instead of the root command

上级 91ca0c41
......@@ -23,12 +23,12 @@ import (
)
type GenericFlags struct {
ZapOpts zap.Options
ZapOpts *zap.Options
}
func NewGenericFlags() *GenericFlags {
return &GenericFlags{
ZapOpts: zap.Options{},
ZapOpts: &zap.Options{},
}
}
......
......@@ -17,6 +17,7 @@ package operator
import (
"context"
"flag"
"time"
"github.com/spf13/cobra"
......@@ -100,7 +101,8 @@ func init() {
}
func runCommand(cmd *cobra.Command, options *CreateOptions) error {
logger := zap.New(zap.UseFlagOptions(&options.GenericFlags.ZapOpts))
flag.Parse()
logger := zap.New(zap.UseFlagOptions(options.GenericFlags.ZapOpts))
ctrl.SetLogger(logger)
config := ctrl.GetConfigOrDie()
......
......@@ -50,7 +50,6 @@ func Execute() {
func init() {
genFlags := common.NewGenericFlags()
genFlags.AddFlags(rootCmd)
goflag.Parse()
rootCmd.AddCommand(server.NewCmdServer(*genFlags))
rootCmd.AddCommand(operator.NewCmdOperator(*genFlags))
......
......@@ -16,6 +16,7 @@ limitations under the License.
package server
import (
"flag"
"fmt"
"github.com/spf13/cobra"
......@@ -78,7 +79,8 @@ Examples:
}
func runCommand(cmd *cobra.Command, options *CreateOptions) error {
logger := zap.New(zap.UseFlagOptions(&options.GenericFlags.ZapOpts))
flag.Parse()
logger := zap.New(zap.UseFlagOptions(options.GenericFlags.ZapOpts))
cfg, err := ctrl.GetConfig()
if err != nil {
return err
......
......@@ -24,9 +24,9 @@ spec:
containers:
- command:
- /di-orchestrator
- --zap-devel=true
- operator
args:
- "--zap-devel=true"
- "--probe-addr=:8080"
- "--metric-addr=:8443"
- "--leader-elect"
......
......@@ -19,6 +19,7 @@ spec:
- /di-orchestrator
- server
args:
- --zap-devel=true
- --server-bind-address=:8080
- --gpu-alloc-policy=simple
image: registry.sensetime.com/cloudnative4ai/di-orchestrator:v1.0.0
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册