diff --git a/pkg/plugin/v2/init.go b/pkg/plugin/v2/init.go index 5fead829d8a..8c9c697ca3e 100644 --- a/pkg/plugin/v2/init.go +++ b/pkg/plugin/v2/init.go @@ -18,7 +18,6 @@ package v2 import ( "fmt" - "log" "os" "path/filepath" "strings" @@ -42,11 +41,6 @@ type initPlugin struct { license string owner string - // deprecated flags - depFlag *pflag.Flag - depArgs []string - dep bool - // flags fetchDeps bool skipGoVersionCheck bool @@ -87,18 +81,6 @@ func (p *initPlugin) BindFlags(fs *pflag.FlagSet) { // dependency args fs.BoolVar(&p.fetchDeps, "fetch-deps", true, "ensure dependencies are downloaded") - // deprecated dependency args - fs.BoolVar(&p.dep, "dep", true, "if specified, determines whether dep will be used.") - p.depFlag = fs.Lookup("dep") - fs.StringArrayVar(&p.depArgs, "depArgs", nil, "additional arguments for dep") - - if err := fs.MarkDeprecated("dep", "use the fetch-deps flag instead"); err != nil { - log.Printf("error to mark dep flag as deprecated: %v", err) - } - if err := fs.MarkDeprecated("depArgs", "will be removed with version 1 scaffolding"); err != nil { - log.Printf("error to mark dep flag as deprecated: %v", err) - } - // boilerplate args fs.StringVar(&p.license, "license", "apache2", "license to use to boilerplate, may be one of 'apache2', 'none'") @@ -157,7 +139,7 @@ func (p *initPlugin) GetScaffolder() (scaffold.Scaffolder, error) { } func (p *initPlugin) PostScaffold() error { - if (p.depFlag.Changed && !p.dep) || (!p.depFlag.Changed && !p.fetchDeps) { + if !p.fetchDeps { fmt.Println("Skipping fetching dependencies.") return nil } diff --git a/test/e2e/v2/e2e_suite.go b/test/e2e/v2/e2e_suite.go index ccead8d48b1..5bf5a6623dc 100644 --- a/test/e2e/v2/e2e_suite.go +++ b/test/e2e/v2/e2e_suite.go @@ -67,7 +67,7 @@ var _ = Describe("kubebuilder", func() { err := kbc.Init( "--project-version", "2", "--domain", kbc.Domain, - "--dep=false") + "--fetch-deps=false") Expect(err).Should(Succeed()) By("creating api definition") diff --git a/test/e2e/v3/e2e_suite.go b/test/e2e/v3/e2e_suite.go index edd2836b27f..98f7eac2c3b 100644 --- a/test/e2e/v3/e2e_suite.go +++ b/test/e2e/v3/e2e_suite.go @@ -67,7 +67,7 @@ var _ = Describe("kubebuilder", func() { err := kbc.Init( "--project-version", "3-alpha", "--domain", kbc.Domain, - "--dep=false") + "--fetch-deps=false") Expect(err).Should(Succeed()) By("creating api definition")