Skip to content

Commit e3e3658

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1958 from camilamacedo86/v3-dep
⚠️ upgrade kubebuilder module from v2 to v3
2 parents 032f0c4 + 0d938e4 commit e3e3658

File tree

138 files changed

+267
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+267
-267
lines changed

‎cmd/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ package main
1919
import (
2020
"log"
2121

22-
"sigs.k8s.io/kubebuilder/v2/pkg/cli"
23-
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
24-
pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v2"
25-
pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugins/golang/v3"
22+
"sigs.k8s.io/kubebuilder/v3/pkg/cli"
23+
"sigs.k8s.io/kubebuilder/v3/pkg/model/config"
24+
pluginv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2"
25+
pluginv3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3"
2626
)
2727

2828
func main() {

‎common.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ function build_kb {
145145
opts=""
146146
else
147147
# Injects the version into the cmd/version.go file
148-
opts=-ldflags "-X sigs.k8s.io/kubebuilder/v2/cmd.kubeBuilderVersion=$INJECT_KB_VERSION"
148+
opts=-ldflags "-X sigs.k8s.io/kubebuilder/v3/cmd.kubeBuilderVersion=$INJECT_KB_VERSION"
149149
fi
150150

151151
GO111MODULE=on go build $opts -o $kb_root_dir/bin/kubebuilder ./cmd

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module sigs.k8s.io/kubebuilder/v2
1+
module sigs.k8s.io/kubebuilder/v3
22

33
go 1.15
44

‎pkg/cli/api.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
"sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
25-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
24+
"sigs.k8s.io/kubebuilder/v3/pkg/cli/internal/config"
25+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
2626
)
2727

2828
func (c cli) newCreateAPICmd() *cobra.Command {

‎pkg/cli/cli.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"github.com/spf13/cobra"
2525
"github.com/spf13/pflag"
2626

27-
internalconfig "sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
28-
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
29-
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
30-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
27+
internalconfig "sigs.k8s.io/kubebuilder/v3/pkg/cli/internal/config"
28+
"sigs.k8s.io/kubebuilder/v3/pkg/internal/validation"
29+
"sigs.k8s.io/kubebuilder/v3/pkg/model/config"
30+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
3131
)
3232

3333
const (

‎pkg/cli/cli_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
. "github.com/onsi/ginkgo"
2323
. "github.com/onsi/gomega"
2424

25-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
25+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
2626
)
2727

2828
func TestCLI(t *testing.T) {

‎pkg/cli/cli_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
. "github.com/onsi/gomega"
2626
"github.com/spf13/cobra"
2727

28-
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
29-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
28+
"sigs.k8s.io/kubebuilder/v3/pkg/model/config"
29+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
3030
)
3131

3232
func makeMockPluginsFor(projectVersion string, pluginKeys ...string) []plugin.Plugin {

‎pkg/cli/cmd_helpers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
"sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
25-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
24+
"sigs.k8s.io/kubebuilder/v3/pkg/cli/internal/config"
25+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
2626
)
2727

2828
// cmdErr updates a cobra command to output error information when executed

‎pkg/cli/edit.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24-
"sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
25-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
24+
"sigs.k8s.io/kubebuilder/v3/pkg/cli/internal/config"
25+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
2626
)
2727

2828
func (c cli) newEditCmd() *cobra.Command {

‎pkg/cli/init.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626

2727
"github.com/spf13/cobra"
2828

29-
internalconfig "sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
30-
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
31-
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
29+
internalconfig "sigs.k8s.io/kubebuilder/v3/pkg/cli/internal/config"
30+
"sigs.k8s.io/kubebuilder/v3/pkg/model/config"
31+
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
3232
)
3333

3434
func (c cli) newInitCmd() *cobra.Command {

0 commit comments

Comments
 (0)