From 5ecb58f18750843093d3e161489c290798275130 Mon Sep 17 00:00:00 2001 From: Kimmo Lehto Date: Thu, 15 Aug 2024 12:47:01 +0300 Subject: [PATCH] Migrate to rig v2 wip Signed-off-by: Kimmo Lehto --- action/config_edit.go | 2 +- action/config_status.go | 2 +- cmd/flags.go | 4 ++-- cmd/init.go | 2 +- configurer/linux.go | 4 ++-- configurer/linux/alpine.go | 8 ++++---- configurer/linux/archlinux.go | 6 +++--- configurer/linux/coreos.go | 6 +++--- configurer/linux/debian.go | 6 +++--- configurer/linux/enterpriselinux.go | 2 +- configurer/linux/enterpriselinux/almalinux.go | 4 ++-- configurer/linux/enterpriselinux/amazon.go | 6 +++--- configurer/linux/enterpriselinux/centos.go | 4 ++-- configurer/linux/enterpriselinux/fedora.go | 4 ++-- configurer/linux/enterpriselinux/oracle.go | 4 ++-- configurer/linux/enterpriselinux/rhel.go | 4 ++-- configurer/linux/enterpriselinux/rocky.go | 4 ++-- configurer/linux/flatcar.go | 6 +++--- configurer/linux/linux_test.go | 2 +- configurer/linux/opensuse.go | 4 ++-- configurer/linux/slackware.go | 6 +++--- configurer/linux/sles.go | 8 ++++---- configurer/linux/ubuntu.go | 4 ++-- go.mod | 2 +- phase/backup.go | 2 +- phase/configure_k0s.go | 2 +- phase/connect.go | 2 +- phase/download_k0s.go | 2 +- phase/gather_k0s_facts.go | 2 +- phase/get_kubeconfig.go | 2 +- phase/get_kubeconfig_test.go | 2 +- phase/initialize_k0s.go | 2 +- phase/install_binaries.go | 2 +- phase/install_controllers.go | 2 +- phase/install_workers.go | 2 +- phase/lock.go | 2 +- phase/prepare_hosts.go | 4 ++-- phase/reset_controllers.go | 2 +- phase/reset_leader.go | 2 +- phase/reset_workers.go | 2 +- phase/restore.go | 2 +- phase/upload_k0s.go | 2 +- phase/uploadfiles.go | 2 +- pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go | 8 ++++---- .../k0sctl.k0sproject.io/v1beta1/cluster/host_test.go | 6 +++--- pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go | 2 +- pkg/node/statusfunc.go | 2 +- 47 files changed, 81 insertions(+), 81 deletions(-) diff --git a/action/config_edit.go b/action/config_edit.go index c74ab04a..219699c7 100644 --- a/action/config_edit.go +++ b/action/config_edit.go @@ -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" diff --git a/action/config_status.go b/action/config_status.go index d7807af8..eaa053e7 100644 --- a/action/config_status.go +++ b/action/config_status.go @@ -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 { diff --git a/cmd/flags.go b/cmd/flags.go index 7e6020c3..b47ec2f1 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -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" diff --git a/cmd/init.go b/cmd/init.go index 8766a765..f4272c82 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -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" diff --git a/configurer/linux.go b/configurer/linux.go index cb49b6e1..d6119e30 100644 --- a/configurer/linux.go +++ b/configurer/linux.go @@ -9,8 +9,8 @@ import ( "sync" "github.com/alessio/shellescape" - "github.com/k0sproject/rig/exec" - "github.com/k0sproject/rig/os" + "github.com/k0sproject/rig/v2/exec" + "github.com/k0sproject/rig/v2/os" "github.com/k0sproject/version" ) diff --git a/configurer/linux/alpine.go b/configurer/linux/alpine.go index 1ceb85f5..9af24539 100644 --- a/configurer/linux/alpine.go +++ b/configurer/linux/alpine.go @@ -4,10 +4,10 @@ import ( "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" + "github.com/k0sproject/rig/v2/exec" + "github.com/k0sproject/rig/v2/os" + "github.com/k0sproject/rig/v2/os/registry" ) // BaseLinux for tricking go interfaces diff --git a/configurer/linux/archlinux.go b/configurer/linux/archlinux.go index ea84c260..1fa107d5 100644 --- a/configurer/linux/archlinux.go +++ b/configurer/linux/archlinux.go @@ -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" ) // Archlinux provides OS support for Archlinux systems diff --git a/configurer/linux/coreos.go b/configurer/linux/coreos.go index 35c382da..45cf54d0 100644 --- a/configurer/linux/coreos.go +++ b/configurer/linux/coreos.go @@ -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 diff --git a/configurer/linux/debian.go b/configurer/linux/debian.go index 00207d71..2bd2364c 100644 --- a/configurer/linux/debian.go +++ b/configurer/linux/debian.go @@ -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 diff --git a/configurer/linux/enterpriselinux.go b/configurer/linux/enterpriselinux.go index 1588c775..ad687e28 100644 --- a/configurer/linux/enterpriselinux.go +++ b/configurer/linux/enterpriselinux.go @@ -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 diff --git a/configurer/linux/enterpriselinux/almalinux.go b/configurer/linux/enterpriselinux/almalinux.go index 666a418c..3d2c6392 100644 --- a/configurer/linux/enterpriselinux/almalinux.go +++ b/configurer/linux/enterpriselinux/almalinux.go @@ -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" ) // AlmaLinux provides OS support for AlmaLinux diff --git a/configurer/linux/enterpriselinux/amazon.go b/configurer/linux/enterpriselinux/amazon.go index 2da9fd45..16c774cd 100644 --- a/configurer/linux/enterpriselinux/amazon.go +++ b/configurer/linux/enterpriselinux/amazon.go @@ -3,9 +3,9 @@ package enterpriselinux 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 diff --git a/configurer/linux/enterpriselinux/centos.go b/configurer/linux/enterpriselinux/centos.go index 89d20765..60668723 100644 --- a/configurer/linux/enterpriselinux/centos.go +++ b/configurer/linux/enterpriselinux/centos.go @@ -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" ) // CentOS provides OS support for CentOS diff --git a/configurer/linux/enterpriselinux/fedora.go b/configurer/linux/enterpriselinux/fedora.go index c2100756..d9650400 100644 --- a/configurer/linux/enterpriselinux/fedora.go +++ b/configurer/linux/enterpriselinux/fedora.go @@ -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 diff --git a/configurer/linux/enterpriselinux/oracle.go b/configurer/linux/enterpriselinux/oracle.go index 16727bc6..8c14c0f2 100644 --- a/configurer/linux/enterpriselinux/oracle.go +++ b/configurer/linux/enterpriselinux/oracle.go @@ -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 diff --git a/configurer/linux/enterpriselinux/rhel.go b/configurer/linux/enterpriselinux/rhel.go index a88da7f4..440dedf9 100644 --- a/configurer/linux/enterpriselinux/rhel.go +++ b/configurer/linux/enterpriselinux/rhel.go @@ -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 diff --git a/configurer/linux/enterpriselinux/rocky.go b/configurer/linux/enterpriselinux/rocky.go index 022c6bbb..4ea93659 100644 --- a/configurer/linux/enterpriselinux/rocky.go +++ b/configurer/linux/enterpriselinux/rocky.go @@ -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 diff --git a/configurer/linux/flatcar.go b/configurer/linux/flatcar.go index 7591a6df..f3bb9790 100644 --- a/configurer/linux/flatcar.go +++ b/configurer/linux/flatcar.go @@ -3,9 +3,9 @@ package linux 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 { diff --git a/configurer/linux/linux_test.go b/configurer/linux/linux_test.go index 99d33f77..4887fdb7 100644 --- a/configurer/linux/linux_test.go +++ b/configurer/linux/linux_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/k0sproject/rig/exec" + "github.com/k0sproject/rig/v2/exec" "github.com/stretchr/testify/require" ) diff --git a/configurer/linux/opensuse.go b/configurer/linux/opensuse.go index eff875fa..118dfe34 100644 --- a/configurer/linux/opensuse.go +++ b/configurer/linux/opensuse.go @@ -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 diff --git a/configurer/linux/slackware.go b/configurer/linux/slackware.go index ec51757f..60f98a1e 100644 --- a/configurer/linux/slackware.go +++ b/configurer/linux/slackware.go @@ -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 diff --git a/configurer/linux/sles.go b/configurer/linux/sles.go index 329c2bb3..28e122e8 100644 --- a/configurer/linux/sles.go +++ b/configurer/linux/sles.go @@ -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 diff --git a/configurer/linux/ubuntu.go b/configurer/linux/ubuntu.go index a10fd2d4..e5613e1e 100644 --- a/configurer/linux/ubuntu.go +++ b/configurer/linux/ubuntu.go @@ -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 diff --git a/go.mod b/go.mod index d6655aaf..a5160fe3 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/phase/backup.go b/phase/backup.go index 0957e10d..d241dba6 100644 --- a/phase/backup.go +++ b/phase/backup.go @@ -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" ) diff --git a/phase/configure_k0s.go b/phase/configure_k0s.go index 26163032..661d173a 100644 --- a/phase/configure_k0s.go +++ b/phase/configure_k0s.go @@ -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" diff --git a/phase/connect.go b/phase/connect.go index 9949970e..3febbc7b 100644 --- a/phase/connect.go +++ b/phase/connect.go @@ -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" ) diff --git a/phase/download_k0s.go b/phase/download_k0s.go index 13197fee..52c808f5 100644 --- a/phase/download_k0s.go +++ b/phase/download_k0s.go @@ -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" ) diff --git a/phase/gather_k0s_facts.go b/phase/gather_k0s_facts.go index 3a61b24c..e156ec88 100644 --- a/phase/gather_k0s_facts.go +++ b/phase/gather_k0s_facts.go @@ -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" ) diff --git a/phase/get_kubeconfig.go b/phase/get_kubeconfig.go index 19943fe9..ef9c27cc 100644 --- a/phase/get_kubeconfig.go +++ b/phase/get_kubeconfig.go @@ -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" ) diff --git a/phase/get_kubeconfig_test.go b/phase/get_kubeconfig_test.go index cb42fc64..d1d0b460 100644 --- a/phase/get_kubeconfig_test.go +++ b/phase/get_kubeconfig_test.go @@ -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" ) diff --git a/phase/initialize_k0s.go b/phase/initialize_k0s.go index 7cdc9ba4..b6732538 100644 --- a/phase/initialize_k0s.go +++ b/phase/initialize_k0s.go @@ -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" ) diff --git a/phase/install_binaries.go b/phase/install_binaries.go index 565b974b..4d6ea51b 100644 --- a/phase/install_binaries.go +++ b/phase/install_binaries.go @@ -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" ) diff --git a/phase/install_controllers.go b/phase/install_controllers.go index 74bcbf65..25efb090 100644 --- a/phase/install_controllers.go +++ b/phase/install_controllers.go @@ -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" ) diff --git a/phase/install_workers.go b/phase/install_workers.go index 970d9ec2..01055342 100644 --- a/phase/install_workers.go +++ b/phase/install_workers.go @@ -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" ) diff --git a/phase/lock.go b/phase/lock.go index aa5a8210..41992dd9 100644 --- a/phase/lock.go +++ b/phase/lock.go @@ -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" ) diff --git a/phase/prepare_hosts.go b/phase/prepare_hosts.go index 05426ef9..7fa1f507 100644 --- a/phase/prepare_hosts.go +++ b/phase/prepare_hosts.go @@ -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" ) diff --git a/phase/reset_controllers.go b/phase/reset_controllers.go index f7eb8707..438f2882 100644 --- a/phase/reset_controllers.go +++ b/phase/reset_controllers.go @@ -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" ) diff --git a/phase/reset_leader.go b/phase/reset_leader.go index 6db2bd07..0ae1743c 100644 --- a/phase/reset_leader.go +++ b/phase/reset_leader.go @@ -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" ) diff --git a/phase/reset_workers.go b/phase/reset_workers.go index 1007fea7..5d9553ef 100644 --- a/phase/reset_workers.go +++ b/phase/reset_workers.go @@ -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" ) diff --git a/phase/restore.go b/phase/restore.go index fb22be96..11d62bae 100644 --- a/phase/restore.go +++ b/phase/restore.go @@ -6,7 +6,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" ) diff --git a/phase/upload_k0s.go b/phase/upload_k0s.go index c6ef799b..aba1166b 100644 --- a/phase/upload_k0s.go +++ b/phase/upload_k0s.go @@ -8,7 +8,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" ) diff --git a/phase/uploadfiles.go b/phase/uploadfiles.go index 7d14a5e2..9e626980 100644 --- a/phase/uploadfiles.go +++ b/phase/uploadfiles.go @@ -8,7 +8,7 @@ import ( "github.com/alessio/shellescape" "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" ) diff --git a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go index 7190a295..74ee1213 100644 --- a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go +++ b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go @@ -15,10 +15,10 @@ import ( "github.com/go-playground/validator/v10" "github.com/jellydator/validation" "github.com/jellydator/validation/is" - "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" + "github.com/k0sproject/rig/v2/exec" + "github.com/k0sproject/rig/v2/os" + "github.com/k0sproject/rig/v2/os/registry" "github.com/k0sproject/version" log "github.com/sirupsen/logrus" ) diff --git a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host_test.go b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host_test.go index 5fcfcded..2b64114e 100644 --- a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host_test.go +++ b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host_test.go @@ -6,9 +6,9 @@ import ( cfg "github.com/k0sproject/k0sctl/configurer" "github.com/k0sproject/k0sctl/configurer/linux" - "github.com/k0sproject/rig" - "github.com/k0sproject/rig/exec" - "github.com/k0sproject/rig/os" + "github.com/k0sproject/rig/v2" + "github.com/k0sproject/rig/v2/exec" + "github.com/k0sproject/rig/v2/os" "github.com/k0sproject/version" "github.com/stretchr/testify/require" ) diff --git a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go index 453bd80b..0ec3c748 100644 --- a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go +++ b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go @@ -15,7 +15,7 @@ import ( "github.com/creasty/defaults" "github.com/k0sproject/dig" "github.com/k0sproject/k0sctl/pkg/retry" - "github.com/k0sproject/rig/exec" + "github.com/k0sproject/rig/v2/exec" "github.com/k0sproject/version" "gopkg.in/yaml.v2" ) diff --git a/pkg/node/statusfunc.go b/pkg/node/statusfunc.go index 3066b56d..106f24f9 100644 --- a/pkg/node/statusfunc.go +++ b/pkg/node/statusfunc.go @@ -8,7 +8,7 @@ import ( "time" "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" )