Change module path according to Go docs (#1220)

https://go.dev/doc/modules/major-version

This way we can bump the kairos dependency on the provider-kairos repo

which otherwise produced the error:

```
~/workspace/kairos/provider-kairos (main)*$ go get -u github.com/kairos-io/kairos@v2.0.0-alpha3
go: github.com/kairos-io/kairos@v2.0.0-alpha3: invalid version: module contains a go.mod file, so module path must match major version ("github.com/kairos-io/kairos/v2")
```

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
Co-authored-by: Itxaka <itxaka.garcia@spectrocloud.com>
This commit is contained in:
Dimitris Karakasilis
2023-03-30 14:18:53 +03:00
committed by Itxaka
parent 1073b07f6a
commit e7807dd66c
21 changed files with 42 additions and 42 deletions

View File

@@ -8,10 +8,10 @@ import (
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
hook "github.com/kairos-io/kairos/internal/agent/hooks" hook "github.com/kairos-io/kairos/v2/internal/agent/hooks"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/kairos-io/kairos/pkg/config/collector" "github.com/kairos-io/kairos/v2/pkg/config/collector"
"github.com/nxadm/tail" "github.com/nxadm/tail"
) )

View File

@@ -6,8 +6,8 @@ import (
"os" "os"
"path/filepath" "path/filepath"
. "github.com/kairos-io/kairos/internal/agent" . "github.com/kairos-io/kairos/v2/internal/agent"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

View File

@@ -3,7 +3,7 @@ package agent
import ( import (
"os" "os"
"github.com/kairos-io/kairos/internal/kairos" "github.com/kairos-io/kairos/v2/internal/kairos"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

View File

@@ -3,7 +3,7 @@ package hook
import ( import (
"github.com/kairos-io/kairos-sdk/bundles" "github.com/kairos-io/kairos-sdk/bundles"
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
) )
type BundleOption struct{} type BundleOption struct{}

View File

@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"github.com/kairos-io/kairos-sdk/system" "github.com/kairos-io/kairos-sdk/system"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
) )
type GrubOptions struct{} type GrubOptions struct{}

View File

@@ -1,7 +1,7 @@
package hook package hook
import ( import (
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
) )
type Interface interface { type Interface interface {

View File

@@ -7,7 +7,7 @@ import (
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
kcryptconfig "github.com/kairos-io/kcrypt/pkg/config" kcryptconfig "github.com/kairos-io/kcrypt/pkg/config"
) )

View File

@@ -2,7 +2,7 @@ package hook
import ( import (
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
"github.com/kairos-io/kairos/pkg/config" "github.com/kairos-io/kairos/v2/pkg/config"
) )
type Lifecycle struct{} type Lifecycle struct{}

View File

@@ -7,7 +7,7 @@ import (
"strings" "strings"
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/mudler/yip/pkg/schema" "github.com/mudler/yip/pkg/schema"
yip "github.com/mudler/yip/pkg/schema" yip "github.com/mudler/yip/pkg/schema"
"gopkg.in/yaml.v1" "gopkg.in/yaml.v1"

View File

@@ -2,7 +2,7 @@ package hook
import ( import (
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
) )

View File

@@ -15,11 +15,11 @@ import (
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
hook "github.com/kairos-io/kairos/internal/agent/hooks" hook "github.com/kairos-io/kairos/v2/internal/agent/hooks"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
"github.com/kairos-io/kairos/internal/cmd" "github.com/kairos-io/kairos/v2/internal/cmd"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/kairos-io/kairos/pkg/config/collector" "github.com/kairos-io/kairos/v2/pkg/config/collector"
qr "github.com/mudler/go-nodepair/qrcode" qr "github.com/mudler/go-nodepair/qrcode"
"github.com/mudler/go-pluggable" "github.com/mudler/go-pluggable"
"github.com/pterm/pterm" "github.com/pterm/pterm"

View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"os" "os"
"github.com/kairos-io/kairos/pkg/config" "github.com/kairos-io/kairos/v2/pkg/config"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"

View File

@@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
"github.com/kairos-io/kairos/internal/cmd" "github.com/kairos-io/kairos/v2/internal/cmd"
config "github.com/kairos-io/kairos/pkg/config" config "github.com/kairos-io/kairos/v2/pkg/config"
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos-sdk/unstructured" "github.com/kairos-io/kairos-sdk/unstructured"

View File

@@ -4,9 +4,9 @@ import (
"fmt" "fmt"
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
"github.com/kairos-io/kairos/pkg/config" "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/kairos-io/kairos/pkg/config/collector" "github.com/kairos-io/kairos/v2/pkg/config/collector"
"github.com/mudler/go-pluggable" "github.com/mudler/go-pluggable"
) )

View File

@@ -7,8 +7,8 @@ import (
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
"github.com/kairos-io/kairos/internal/cmd" "github.com/kairos-io/kairos/v2/internal/cmd"
qr "github.com/mudler/go-nodepair/qrcode" qr "github.com/mudler/go-nodepair/qrcode"
"github.com/mudler/go-pluggable" "github.com/mudler/go-pluggable"
"github.com/pterm/pterm" "github.com/pterm/pterm"

View File

@@ -11,11 +11,11 @@ import (
sdk "github.com/kairos-io/kairos-sdk/bus" sdk "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/machine"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
hook "github.com/kairos-io/kairos/internal/agent/hooks" hook "github.com/kairos-io/kairos/v2/internal/agent/hooks"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
"github.com/kairos-io/kairos/internal/cmd" "github.com/kairos-io/kairos/v2/internal/cmd"
"github.com/kairos-io/kairos/pkg/config" "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/kairos-io/kairos/pkg/config/collector" "github.com/kairos-io/kairos/v2/pkg/config/collector"
"github.com/mudler/go-pluggable" "github.com/mudler/go-pluggable"
"github.com/pterm/pterm" "github.com/pterm/pterm"

View File

@@ -9,12 +9,12 @@ import (
"strings" "strings"
events "github.com/kairos-io/kairos-sdk/bus" events "github.com/kairos-io/kairos-sdk/bus"
"github.com/kairos-io/kairos/pkg/config" "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/kairos-io/kairos/pkg/config/collector" "github.com/kairos-io/kairos/v2/pkg/config/collector"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
"github.com/kairos-io/kairos/internal/bus" "github.com/kairos-io/kairos/v2/internal/bus"
"github.com/kairos-io/kairos/pkg/github" "github.com/kairos-io/kairos/v2/pkg/github"
"github.com/mudler/go-pluggable" "github.com/mudler/go-pluggable"
) )

View File

@@ -7,7 +7,7 @@ import (
"os" "os"
"strings" "strings"
sc "github.com/kairos-io/kairos/pkg/config/schemas" sc "github.com/kairos-io/kairos/v2/pkg/config/schemas"
) )
// JSONSchema builds a JSON Schema based on the Root Schema and the given version // JSONSchema builds a JSON Schema based on the Root Schema and the given version

View File

@@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
. "github.com/kairos-io/kairos/internal/agent" . "github.com/kairos-io/kairos/v2/internal/agent"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

View File

@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/kairos-io/kairos/internal/kairos" "github.com/kairos-io/kairos/v2/internal/kairos"
"github.com/kairos-io/kairos-sdk/utils" "github.com/kairos-io/kairos-sdk/utils"
"github.com/pterm/pterm" "github.com/pterm/pterm"

View File

@@ -13,8 +13,8 @@ import (
"text/template" "text/template"
"time" "time"
"github.com/kairos-io/kairos/internal/agent" "github.com/kairos-io/kairos/v2/internal/agent"
"github.com/kairos-io/kairos/pkg/config" "github.com/kairos-io/kairos/v2/pkg/config"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
process "github.com/mudler/go-processmanager" process "github.com/mudler/go-processmanager"
"github.com/nxadm/tail" "github.com/nxadm/tail"