Skip to content

Commit

Permalink
Merge pull request #1673 from 24sama/release-2.3-origin
Browse files Browse the repository at this point in the history
feat: modify go mod path
  • Loading branch information
24sama authored Dec 21, 2022
2 parents 854cd82 + 4179843 commit 49b32d3
Show file tree
Hide file tree
Showing 246 changed files with 1,183 additions and 1,047 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ ifneq ($(GIT_TAG),)
VERSION = ${GIT_TAG}
endif

LDFLAGS += -X github.com/kubesphere/kubekey/version.version=${VERSION}
LDFLAGS += -X github.com/kubesphere/kubekey/version.metadata=${VERSION_METADATA}
LDFLAGS += -X github.com/kubesphere/kubekey/version.gitCommit=${GIT_COMMIT}
LDFLAGS += -X github.com/kubesphere/kubekey/version.gitTreeState=${GIT_DIRTY}
LDFLAGS += -X github.com/kubesphere/kubekey/v2/version.version=${VERSION}
LDFLAGS += -X github.com/kubesphere/kubekey/v2/version.metadata=${VERSION_METADATA}
LDFLAGS += -X github.com/kubesphere/kubekey/v2/version.gitCommit=${GIT_COMMIT}
LDFLAGS += -X github.com/kubesphere/kubekey/v2/version.gitTreeState=${GIT_DIRTY}

# see kk
binary:
Expand Down
5 changes: 3 additions & 2 deletions apis/kubekey/v1alpha1/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ import (
"strconv"
"strings"

"github.com/kubesphere/kubekey/pkg/core/logger"
"github.com/kubesphere/kubekey/pkg/core/util"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/kubesphere/kubekey/v2/pkg/core/logger"
"github.com/kubesphere/kubekey/v2/pkg/core/util"
)

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
Expand Down
2 changes: 1 addition & 1 deletion apis/kubekey/v1alpha1/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"strings"

"github.com/kubesphere/kubekey/pkg/core/util"
"github.com/kubesphere/kubekey/v2/pkg/core/util"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions apis/kubekey/v1alpha2/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"strconv"
"strings"

"github.com/kubesphere/kubekey/pkg/core/connector"

"github.com/kubesphere/kubekey/pkg/core/logger"
"github.com/kubesphere/kubekey/pkg/core/util"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"

"github.com/kubesphere/kubekey/v2/pkg/core/connector"
"github.com/kubesphere/kubekey/v2/pkg/core/logger"
"github.com/kubesphere/kubekey/v2/pkg/core/util"
)

// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
Expand Down
2 changes: 1 addition & 1 deletion apis/kubekey/v1alpha2/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"strings"

"github.com/kubesphere/kubekey/pkg/core/util"
"github.com/kubesphere/kubekey/v2/pkg/core/util"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions clients/clientset/versioned/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions clients/clientset/versioned/fake/clientset_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clients/clientset/versioned/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clients/clientset/versioned/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clients/clientset/versioned/typed/kubekey/v1alpha1/cluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clients/clientset/versioned/typed/kubekey/v1alpha2/cluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions clients/informers/externalversions/factory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clients/informers/externalversions/generic.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions clients/informers/externalversions/kubekey/interface.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/listers/kubekey/v1alpha1/cluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion clients/listers/kubekey/v1alpha2/cluster.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion cmd/ctl/add/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
package add

import (
"github.com/kubesphere/kubekey/cmd/ctl/options"
"github.com/spf13/cobra"

"github.com/kubesphere/kubekey/v2/cmd/ctl/options"
)

type AddOptions struct {
Expand Down
9 changes: 5 additions & 4 deletions cmd/ctl/add/add_nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ limitations under the License.
package add

import (
"github.com/kubesphere/kubekey/cmd/ctl/options"
"github.com/kubesphere/kubekey/cmd/ctl/util"
"github.com/kubesphere/kubekey/pkg/common"
"github.com/kubesphere/kubekey/pkg/pipelines"
"github.com/spf13/cobra"

"github.com/kubesphere/kubekey/v2/cmd/ctl/options"
"github.com/kubesphere/kubekey/v2/cmd/ctl/util"
"github.com/kubesphere/kubekey/v2/pkg/common"
"github.com/kubesphere/kubekey/v2/pkg/pipelines"
)

type AddNodesOptions struct {
Expand Down
5 changes: 3 additions & 2 deletions cmd/ctl/artifact/artifact.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
package artifact

import (
"github.com/kubesphere/kubekey/cmd/ctl/artifact/images"
"github.com/kubesphere/kubekey/cmd/ctl/options"
"github.com/spf13/cobra"

"github.com/kubesphere/kubekey/v2/cmd/ctl/artifact/images"
"github.com/kubesphere/kubekey/v2/cmd/ctl/options"
)

type ArtifactOptions struct {
Expand Down
10 changes: 6 additions & 4 deletions cmd/ctl/artifact/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ package artifact

import (
"fmt"
"github.com/kubesphere/kubekey/cmd/ctl/options"
"github.com/kubesphere/kubekey/cmd/ctl/util"
"github.com/kubesphere/kubekey/pkg/common"
"github.com/kubesphere/kubekey/pkg/pipelines"

"github.com/spf13/cobra"

"github.com/kubesphere/kubekey/v2/cmd/ctl/options"
"github.com/kubesphere/kubekey/v2/cmd/ctl/util"
"github.com/kubesphere/kubekey/v2/pkg/common"
"github.com/kubesphere/kubekey/v2/pkg/pipelines"
)

type ArtifactExportOptions struct {
Expand Down
3 changes: 2 additions & 1 deletion cmd/ctl/artifact/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
package images

import (
"github.com/kubesphere/kubekey/cmd/ctl/options"
"github.com/spf13/cobra"

"github.com/kubesphere/kubekey/v2/cmd/ctl/options"
)

type ArtifactImagesOptions struct {
Expand Down
Loading

0 comments on commit 49b32d3

Please sign in to comment.