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

[wip] Migrate to rig v2 #755

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[wip] Migrate to rig v2 #755

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion action/config_edit.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/k0sproject/k0sctl/analytics"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"

osexec "os/exec"

Expand Down
2 changes: 1 addition & 1 deletion action/config_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/k0sproject/k0sctl/analytics"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
)

type ConfigStatus struct {
Expand Down
4 changes: 2 additions & 2 deletions cmd/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/retry"
k0sctl "github.com/k0sproject/k0sctl/version"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/exec"
"github.com/logrusorgru/aurora"
"github.com/shiena/ansicolor"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/k0sproject/dig"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/v2"

"github.com/urfave/cli/v2"
"gopkg.in/yaml.v2"
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"sync"

"github.com/alessio/shellescape"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/v2/exec"

Check failure on line 12 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/exec (imported by github.com/k0sproject/k0sctl/cmd); to add:

Check failure on line 12 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / Analyze (go) 

no required module provides package github.com/k0sproject/rig/v2/exec; to add it:

Check failure on line 12 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/exec (imported by github.com/k0sproject/k0sctl/cmd); to add:

Check failure on line 12 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / unit-test (ubuntu-latest) 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/exec (imported by github.com/k0sproject/k0sctl/action); to add:
"github.com/k0sproject/rig/v2/os"

Check failure on line 13 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os (imported by github.com/k0sproject/k0sctl/phase); to add:

Check failure on line 13 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os (imported by github.com/k0sproject/k0sctl/phase); to add:

Check failure on line 13 in configurer/linux.go

View workflow job for this annotation

GitHub Actions / unit-test (ubuntu-latest) 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os (imported by github.com/k0sproject/k0sctl/configurer); to add:
"github.com/k0sproject/version"
)

Expand Down
8 changes: 4 additions & 4 deletions configurer/linux/alpine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"strings"

"github.com/k0sproject/k0sctl/configurer"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"

Check failure on line 7 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2 (imported by github.com/k0sproject/k0sctl/cmd); to add:

Check failure on line 7 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2 (imported by github.com/k0sproject/k0sctl/cmd); to add:

Check failure on line 7 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / unit-test (ubuntu-latest) 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2 (imported by github.com/k0sproject/k0sctl/cmd); to add:
"github.com/k0sproject/rig/v2/exec"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/rig/v2/os/registry"

Check failure on line 10 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os/registry (imported by github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster); to add:

Check failure on line 10 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / Analyze (go) 

no required module provides package github.com/k0sproject/rig/v2/os/registry; to add it:

Check failure on line 10 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os/registry (imported by github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster); to add:

Check failure on line 10 in configurer/linux/alpine.go

View workflow job for this annotation

GitHub Actions / unit-test (ubuntu-latest) 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os/registry (imported by github.com/k0sproject/k0sctl/configurer/linux); to add:
)

// BaseLinux for tricking go interfaces
Expand Down
6 changes: 3 additions & 3 deletions configurer/linux/archlinux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import (
"github.com/k0sproject/k0sctl/configurer"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/linux"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/linux"

Check failure on line 6 in configurer/linux/archlinux.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os/linux (imported by github.com/k0sproject/k0sctl/configurer/linux); to add:

Check failure on line 6 in configurer/linux/archlinux.go

View workflow job for this annotation

GitHub Actions / Analyze (go) 

no required module provides package github.com/k0sproject/rig/v2/os/linux; to add it:

Check failure on line 6 in configurer/linux/archlinux.go

View workflow job for this annotation

GitHub Actions / build 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os/linux (imported by github.com/k0sproject/k0sctl/configurer/linux); to add:

Check failure on line 6 in configurer/linux/archlinux.go

View workflow job for this annotation

GitHub Actions / unit-test (ubuntu-latest) 

missing go.sum entry for module providing package github.com/k0sproject/rig/v2/os/linux (imported by github.com/k0sproject/k0sctl/configurer/linux); to add:
"github.com/k0sproject/rig/v2/os/registry"
)

// Archlinux provides OS support for Archlinux systems
Expand Down
6 changes: 3 additions & 3 deletions configurer/linux/coreos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"errors"
"strings"

"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/rig/v2/os/registry"
)

// CoreOS provides OS support for ostree based Fedora & RHEL systems
Expand Down
6 changes: 3 additions & 3 deletions configurer/linux/debian.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package linux

import (
"github.com/k0sproject/k0sctl/configurer"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/linux"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/linux"
"github.com/k0sproject/rig/v2/os/registry"
)

// Debian provides OS support for Debian systems
Expand Down
2 changes: 1 addition & 1 deletion configurer/linux/enterpriselinux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package linux

import (
"github.com/k0sproject/k0sctl/configurer"
"github.com/k0sproject/rig/os/linux"
"github.com/k0sproject/rig/v2/os/linux"
)

// EnterpriseLinux is a base package for several RHEL-like enterprise linux distributions
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/enterpriselinux/almalinux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import (
"github.com/k0sproject/k0sctl/configurer"
k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// AlmaLinux provides OS support for AlmaLinux
Expand All @@ -15,7 +15,7 @@

func init() {
registry.RegisterOSModule(
func(os rig.OSVersion) bool {

Check failure on line 18 in configurer/linux/enterpriselinux/almalinux.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

undefined: rig (typecheck)
return os.ID == "almalinux"
},
func() interface{} {
Expand Down
6 changes: 3 additions & 3 deletions configurer/linux/enterpriselinux/amazon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import (
"github.com/k0sproject/k0sctl/configurer"
k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/rig/v2/os/registry"
)

// AmazonLinux provides OS support for AmazonLinux
Expand All @@ -23,7 +23,7 @@

func init() {
registry.RegisterOSModule(
func(os rig.OSVersion) bool {

Check failure on line 26 in configurer/linux/enterpriselinux/amazon.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

undefined: rig (typecheck)
return os.ID == "amzn"
},
func() interface{} {
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/enterpriselinux/centos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import (
"github.com/k0sproject/k0sctl/configurer"
k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// CentOS provides OS support for CentOS
Expand All @@ -15,7 +15,7 @@

func init() {
registry.RegisterOSModule(
func(os rig.OSVersion) bool {

Check failure on line 18 in configurer/linux/enterpriselinux/centos.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

undefined: rig (typecheck)
return os.ID == "centos"
},
func() interface{} {
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/enterpriselinux/fedora.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/k0sproject/k0sctl/configurer"
k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// Fedora provides OS support for Fedora
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/enterpriselinux/oracle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package enterpriselinux
import (
"github.com/k0sproject/k0sctl/configurer"
k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// OracleLinux provides OS support for Oracle Linuc
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/enterpriselinux/rhel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"

k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// RHEL provides OS support for RedHat Enterprise Linux
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/enterpriselinux/rocky.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package enterpriselinux
import (
"github.com/k0sproject/k0sctl/configurer"
k0slinux "github.com/k0sproject/k0sctl/configurer/linux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// RockyLinux provides OS support for RockyLinux
Expand Down
6 changes: 3 additions & 3 deletions configurer/linux/flatcar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import (
"errors"

"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/rig/v2/os/registry"
)

type Flatcar struct {
Expand All @@ -20,7 +20,7 @@
},
func() interface{} {
fc := &Flatcar{}
fc.SetPath("K0sBinaryPath", "/opt/bin/k0s")

Check failure on line 23 in configurer/linux/flatcar.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

fc.SetPath undefined (type *Flatcar has no field or method SetPath) (typecheck)
return fc
},
)
Expand Down
2 changes: 1 addition & 1 deletion configurer/linux/linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"io"
"testing"

"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -50,7 +50,7 @@

func TestPaths(t *testing.T) {
fc := &Flatcar{}
fc.SetPath("K0sBinaryPath", "/opt/bin/k0s")

Check failure on line 53 in configurer/linux/linux_test.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

fc.SetPath undefined (type *Flatcar has no field or method SetPath) (typecheck)

ubuntu := &Ubuntu{}

Expand All @@ -61,13 +61,13 @@
ExecFError: true,
}

require.Equal(t, "/opt/bin/k0s", fc.K0sBinaryPath())

Check failure on line 64 in configurer/linux/linux_test.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

fc.K0sBinaryPath undefined (type *Flatcar has no field or method K0sBinaryPath) (typecheck)
require.Equal(t, "/usr/local/bin/k0s", ubuntu.K0sBinaryPath())

Check failure on line 65 in configurer/linux/linux_test.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

ubuntu.K0sBinaryPath undefined (type *Ubuntu has no field or method K0sBinaryPath) (typecheck)

require.Equal(t, "/opt/bin/k0s --help", fc.K0sCmdf("--help"))

Check failure on line 67 in configurer/linux/linux_test.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

fc.K0sCmdf undefined (type *Flatcar has no field or method K0sCmdf) (typecheck)
require.Equal(t, "/usr/local/bin/k0s --help", ubuntu.K0sCmdf("--help"))

Check failure on line 68 in configurer/linux/linux_test.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

ubuntu.K0sCmdf undefined (type *Ubuntu has no field or method K0sCmdf) (typecheck)

require.Equal(t, "/var/lib/k0s/pki/admin.conf", fc.KubeconfigPath(h1, fc.DataDirDefaultPath()))

Check failure on line 70 in configurer/linux/linux_test.go

View workflow job for this annotation

GitHub Actions / Run golangci-lint 

fc.KubeconfigPath undefined (type *Flatcar has no field or method KubeconfigPath) (typecheck)
require.Equal(t, "/var/lib/k0s/pki/admin.conf", ubuntu.KubeconfigPath(h1, ubuntu.DataDirDefaultPath()))

require.Equal(t, "/var/lib/k0s/kubelet.conf", fc.KubeconfigPath(h2, fc.DataDirDefaultPath()))
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/opensuse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package linux

import (
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// OpenSUSE provides OS support for OpenSUSE
Expand Down
6 changes: 3 additions & 3 deletions configurer/linux/slackware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strings"

"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/rig/v2/os/registry"
)

// Slackware provides OS support for Slackware Linux
Expand Down
8 changes: 4 additions & 4 deletions configurer/linux/sles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package linux

import (
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/linux"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/rig/v2/os/linux"
"github.com/k0sproject/rig/v2/os/registry"
)

// SLES provides OS support for Suse SUSE Linux Enterprise Server
Expand Down
4 changes: 2 additions & 2 deletions configurer/linux/ubuntu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package linux

import (
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os/registry"
)

// Ubuntu provides OS support for Ubuntu systems
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
Expand Up @@ -16,7 +16,7 @@ require (
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/k0sproject/dig v0.2.0
github.com/k0sproject/rig v0.18.6
github.com/k0sproject/rig/v2 v2.0.0-alpha.3
github.com/logrusorgru/aurora v2.0.3+incompatible
github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786 // indirect
github.com/masterzen/winrm v0.0.0-20240702205601-3fad6e106085 // indirect
Expand Down
2 changes: 1 addition & 1 deletion phase/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
"github.com/k0sproject/version"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion phase/configure_k0s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/node"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
"github.com/k0sproject/version"
"github.com/sergi/go-diff/diffmatchpatch"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion phase/connect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/v2"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion phase/download_k0s.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/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion phase/gather_k0s_facts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/node"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
"github.com/k0sproject/version"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion phase/get_kubeconfig.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/alessio/shellescape"
"github.com/k0sproject/dig"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
"gopkg.in/yaml.v2"
"k8s.io/client-go/tools/clientcmd"
)
Expand Down
2 changes: 1 addition & 1 deletion phase/get_kubeconfig_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/k0sproject/dig"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/v2"
"github.com/stretchr/testify/require"
"k8s.io/client-go/tools/clientcmd"
)
Expand Down
2 changes: 1 addition & 1 deletion phase/initialize_k0s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/node"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion phase/install_binaries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion phase/install_controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/node"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion phase/install_workers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/node"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion phase/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1"
"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
log "github.com/sirupsen/logrus"
)

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

"github.com/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/v2"
"github.com/k0sproject/rig/v2/os"
"github.com/k0sproject/version"
log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion phase/reset_controllers.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/k0sproject/k0sctl/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster"
"github.com/k0sproject/k0sctl/pkg/node"
"github.com/k0sproject/k0sctl/pkg/retry"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/v2/exec"
log "github.com/sirupsen/logrus"
)

Expand Down
Loading
Loading