Skip to content

Commit

Permalink
cleanup: remove v1 code source which is deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
Camila Macedo committed Apr 30, 2020
1 parent bd2bfc6 commit d17db6b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
6 changes: 1 addition & 5 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,11 @@ import (
"log"

"sigs.k8s.io/kubebuilder/cmd/version"
"sigs.k8s.io/kubebuilder/internal/config"
"sigs.k8s.io/kubebuilder/pkg/cli"
pluginv2 "sigs.k8s.io/kubebuilder/pkg/plugin/v2"
)

func main() {
if err := config.CheckProjectVersionSupported(); err != nil {
log.Fatal(err)
}

c, err := cli.New(
cli.WithPlugins(
&pluginv2.Plugin{},
Expand All @@ -39,6 +34,7 @@ func main() {
),
cli.WithExtraCommands(
newEditCmd(),
newUpdateCmd(),
newCompletionCmd(),
version.NewCmd(),
),
Expand Down
1 change: 0 additions & 1 deletion internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ func (e saveError) Error() string {
return fmt.Sprintf("unable to save the configuration: %v", e.err)
}

// todo: check the best way we centralize it
// CheckProjectVersionSupported returns true if the project is already configured and it is v2
func CheckProjectVersionSupported() error {
cfg, err := Read()
Expand Down
9 changes: 6 additions & 3 deletions pkg/scaffold/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ func NewAPIScaffolder(
// Scaffold implements Scaffolder
func (s *apiScaffolder) Scaffold() error {
fmt.Println("Writing scaffold for you to edit...")
if err := internalconfig.CheckProjectVersionSupported(); err != nil {
return err

switch {
case s.config.IsV2(), s.config.IsV3():
return s.scaffold()
default:
return internalconfig.CheckProjectVersionSupported()
}
return s.scaffold()
}

func (s *apiScaffolder) newUniverse() *model.Universe {
Expand Down
8 changes: 5 additions & 3 deletions pkg/scaffold/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ func (s *initScaffolder) newUniverse(boilerplate string) *model.Universe {
// Scaffold implements Scaffolder
func (s *initScaffolder) Scaffold() error {
fmt.Println("Writing scaffold for you to edit...")
if err := internalconfig.CheckProjectVersionSupported(); err != nil {
return err
switch {
case s.config.IsV2(), s.config.IsV3():
return s.scaffold()
default:
return internalconfig.CheckProjectVersionSupported()
}
return s.scaffold()
}

func (s *initScaffolder) scaffold() error {
Expand Down
8 changes: 5 additions & 3 deletions pkg/scaffold/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ func NewWebhookScaffolder(
// Scaffold implements Scaffolder
func (s *webhookScaffolder) Scaffold() error {
fmt.Println("Writing scaffold for you to edit...")
if err := internalconfig.CheckProjectVersionSupported(); err != nil {
return err
switch {
case s.config.IsV2(), s.config.IsV3():
return s.scaffold()
default:
return internalconfig.CheckProjectVersionSupported()
}
return s.scaffold()
}

func (s *webhookScaffolder) newUniverse() *model.Universe {
Expand Down

0 comments on commit d17db6b

Please sign in to comment.