Skip to content

Commit a7560c8

Browse files
committed
InitFlags take a flagset as argument
1 parent c037252 commit a7560c8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

example/prometheus-crd-gen/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ var (
2525
)
2626

2727
func init() {
28-
crdutils.InitFlags(&cfg)
28+
flagset := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
29+
flagset := crdutils.InitFlags(&cfg, flagset)
30+
flagset.Parse(os.Args[1:])
2931
}
3032

3133
func main() {

pkg/cli-utils.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ func MarshallCrd(crd *extensionsobj.CustomResourceDefinition, outputFormat strin
124124
}
125125

126126
// InitFlags prepares command line flags parser
127-
func InitFlags(cfg *Config) {
128-
flagset := flag.NewFlagSet(os.Args[0], flag.ExitOnError)
127+
func InitFlags(cfg *Config, flagset *flag.FlagSet) *flag.FlagSet {
129128
flagset.Var(&cfg.Labels, "labels", "Labels")
130129
flagset.Var(&cfg.Annotations, "annotations", "Annotations")
131130
flagset.BoolVar(&cfg.EnableValidation, "with-validation", true, "Add CRD validation field, default: true")
@@ -136,5 +135,5 @@ func InitFlags(cfg *Config) {
136135
flagset.StringVar(&cfg.ResourceScope, "scope", string(extensionsobj.NamespaceScoped), "CRD scope: 'Namespaced' | 'Cluster'. Default: Namespaced")
137136
flagset.StringVar(&cfg.Version, "version", "v1", "CRD version, default: 'v1'")
138137
flagset.StringVar(&cfg.Plural, "plural", "", "CRD plural name")
139-
flagset.Parse(os.Args[1:])
138+
return flagset
140139
}

0 commit comments

Comments
 (0)