Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⚠️ Go module fullfillment for v2+ #1792

Merged
merged 1 commit into from
Nov 7, 2020
Merged

⚠️ Go module fullfillment for v2+ #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/.goreleaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
builds:
- main: ./cmd
binary: kubebuilder
ldflags: -s -X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
ldflags: -s -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion={{.Version}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.gitCommit={{.Commit}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.buildDate={{.Date}} -X sigs.k8s.io/kubebuilder/v2/cmd/version.kubernetesVendorVersion={{.Env.KUBERNETES_VERSION}}
goos:
- darwin
- linux
Expand Down
8 changes: 4 additions & 4 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package main
import (
"log"

"sigs.k8s.io/kubebuilder/cmd/version"
"sigs.k8s.io/kubebuilder/pkg/cli"
pluginv2 "sigs.k8s.io/kubebuilder/pkg/plugin/v2"
pluginv3 "sigs.k8s.io/kubebuilder/pkg/plugin/v3"
"sigs.k8s.io/kubebuilder/v2/cmd/version"
"sigs.k8s.io/kubebuilder/v2/pkg/cli"
pluginv2 "sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2"
pluginv3 "sigs.k8s.io/kubebuilder/v2/pkg/plugin/v3"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function build_kb {
opts=""
else
# TODO: what does this thing do.
opts=-ldflags "-X sigs.k8s.io/kubebuilder/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION"
opts=-ldflags "-X sigs.k8s.io/kubebuilder/v2/cmd/version.kubeBuilderVersion=$INJECT_KB_VERSION"
fi

GO111MODULE=on go build $opts -o $tmp_root/kubebuilder/bin/kubebuilder ./cmd
Expand Down
2 changes: 1 addition & 1 deletion generate_testdata.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -e
source common.sh

build_kb() {
go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/cmd
go build -o ./bin/kubebuilder sigs.k8s.io/kubebuilder/v2/cmd
}


Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module sigs.k8s.io/kubebuilder
module sigs.k8s.io/kubebuilder/v2

go 1.15

Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"

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

func (c *cli) newCreateAPICmd() *cobra.Command {
Expand Down
8 changes: 4 additions & 4 deletions pkg/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

internalconfig "sigs.k8s.io/kubebuilder/pkg/cli/internal/config"
"sigs.k8s.io/kubebuilder/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/plugin"
internalconfig "sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions pkg/cli/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

internalconfig "sigs.k8s.io/kubebuilder/pkg/cli/internal/config"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/plugin"
internalconfig "sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
)

// Test plugin types and constructors.
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/cmd_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"

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

// cmdErr updates a cobra command to output error information when executed
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"

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

func (c *cli) newEditCmd() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions pkg/cli/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (

"github.com/spf13/cobra"

internalconfig "sigs.k8s.io/kubebuilder/pkg/cli/internal/config"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/plugin"
internalconfig "sigs.k8s.io/kubebuilder/v2/pkg/cli/internal/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
)

func (c *cli) newInitCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/spf13/afero"

"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/internal/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/gomega"
"github.com/spf13/afero"

"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
)

var _ = Describe("Config", func() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"sort"

"sigs.k8s.io/kubebuilder/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
)

// errAmbiguousPlugin should be returned when an ambiguous plugin key is
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/plugins_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"sigs.k8s.io/kubebuilder/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
)

var _ = Describe("resolvePluginsByKey", func() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/spf13/cobra"

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

func (c *cli) newCreateWebhookCmd() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/file/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package file
import (
"text/template"

"sigs.k8s.io/kubebuilder/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
)

// Builder defines the basic methods that any file builder must implement
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/file/mixins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package file

import (
"sigs.k8s.io/kubebuilder/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
)

// PathMixin provides file builders with a path field
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/resource/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/gobuffalo/flect"

"sigs.k8s.io/kubebuilder/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/resource/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"

. "sigs.k8s.io/kubebuilder/pkg/model/resource"
. "sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
)

var _ = Describe("Resource Options", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/resource/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
)

// Resource contains the information required to scaffold files for a resource.
Expand Down
4 changes: 2 additions & 2 deletions pkg/model/resource/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"sigs.k8s.io/kubebuilder/pkg/model/config"
. "sigs.k8s.io/kubebuilder/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
. "sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
)

var _ = Describe("Resource", func() {
Expand Down
6 changes: 3 additions & 3 deletions pkg/model/universe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package model

import (
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/model/file"
"sigs.k8s.io/kubebuilder/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
)

// Universe describes the entire state of file generation
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path"
"strings"

"sigs.k8s.io/kubebuilder/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
)

// DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package plugin
import (
"github.com/spf13/pflag"

"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
)

// Plugin is an interface that defines the common base for all plugins
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/internal/machinery/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"errors"
"fmt"

"sigs.k8s.io/kubebuilder/pkg/model/file"
"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
)

// This file contains the errors returned by the scaffolding machinery
Expand Down
6 changes: 3 additions & 3 deletions pkg/plugin/internal/machinery/scaffold.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (

"golang.org/x/tools/imports"

"sigs.k8s.io/kubebuilder/pkg/model"
"sigs.k8s.io/kubebuilder/pkg/model/file"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/filesystem"
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/filesystem"
)

var options = imports.Options{
Expand Down
6 changes: 3 additions & 3 deletions pkg/plugin/internal/machinery/scaffold_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"

"sigs.k8s.io/kubebuilder/pkg/model"
"sigs.k8s.io/kubebuilder/pkg/model/file"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/filesystem"
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/file"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/filesystem"
)

func TestScaffold(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions pkg/plugin/v2/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import (

"github.com/spf13/pflag"

"sigs.k8s.io/kubebuilder/pkg/model"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/model/resource"
"sigs.k8s.io/kubebuilder/pkg/plugin"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/plugins/addon"
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/plugins/addon"
)

type createAPISubcommand struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/plugin/v2/edit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (

"github.com/spf13/pflag"

"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/plugin"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
)

type editSubcommand struct {
Expand Down
12 changes: 6 additions & 6 deletions pkg/plugin/v2/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (

"github.com/spf13/pflag"

"sigs.k8s.io/kubebuilder/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/plugin"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds"
"sigs.k8s.io/kubebuilder/v2/pkg/internal/validation"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/util"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds"
)

type initSubcommand struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/v2/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package v2

import (
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/plugin"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin"
)

const pluginName = "go" + plugin.DefaultNameQualifier
Expand Down
24 changes: 12 additions & 12 deletions pkg/plugin/v2/scaffolds/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ package scaffolds
import (
"fmt"

"sigs.k8s.io/kubebuilder/pkg/model"
"sigs.k8s.io/kubebuilder/pkg/model/config"
"sigs.k8s.io/kubebuilder/pkg/model/resource"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/crd"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/crd/patches"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/config/samples"
"sigs.k8s.io/kubebuilder/pkg/plugin/v2/scaffolds/internal/templates/controllers"
"sigs.k8s.io/kubebuilder/v2/pkg/model"
"sigs.k8s.io/kubebuilder/v2/pkg/model/config"
"sigs.k8s.io/kubebuilder/v2/pkg/model/resource"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/cmdutil"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/internal/machinery"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/api"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/crd"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/crd/patches"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/rbac"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/config/samples"
"sigs.k8s.io/kubebuilder/v2/pkg/plugin/v2/scaffolds/internal/templates/controllers"
)

// KbDeclarativePattern is the sigs.k8s.io/kubebuilder-declarative-pattern version
Expand Down