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.

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

vendor: move mudler/yip to rancher/yip (backport #769) #774

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 23 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
module github.com/harvester/harvester-installer

go 1.22
go 1.22.5

require (
github.com/harvester/go-common v0.0.0-20230718010724-11313421a8f5
github.com/imdario/mergo v0.3.12
github.com/imdario/mergo v0.3.16
github.com/insomniacslk/dhcp v0.0.0-20210827173440-b95caade3eac
github.com/jroimartin/gocui v0.4.0
github.com/mudler/yip v0.0.0-20211129144714-088f39125cf7
github.com/pkg/errors v0.9.1
github.com/rancher/mapper v0.0.0-20190814232720-058a8b7feb99
github.com/rancher/wharfie v0.6.5
github.com/sirupsen/logrus v1.9.2
github.com/stretchr/testify v1.8.1
github.com/tredoe/osutil v1.3.6
github.com/vishvananda/netlink v1.1.0
golang.org/x/crypto v0.14.0
golang.org/x/net v0.17.0
golang.org/x/sys v0.13.0
gopkg.in/ini.v1 v1.63.2
github.com/rancher/yip v1.9.2
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.9.0
github.com/tredoe/osutil v1.5.0
github.com/vishvananda/netlink v1.2.1-beta.2
golang.org/x/crypto v0.25.0
golang.org/x/net v0.27.0
golang.org/x/sys v0.22.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.25.4
)

require (
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/coreos/yaml v0.0.0-20141224210557-6b16a5714269 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v20.10.20+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
Expand All @@ -37,12 +36,13 @@ require (
github.com/godbus/dbus/v5 v5.0.4 // indirect
github.com/google/go-containerregistry v0.12.2-0.20230106184643-b063f6aeac72 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/itchyny/gojq v0.12.2 // indirect
github.com/itchyny/timefmt-go v0.1.2 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/itchyny/gojq v0.12.16 // indirect
github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/klauspost/compress v1.15.11 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-shellwords v1.0.10 // indirect
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 // indirect
github.com/mdlayher/raw v0.0.0-20191009151244-50f2db8cc065 // indirect
Expand All @@ -51,15 +51,16 @@ require (
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rancher-sandbox/cloud-init v1.14.3-0.20210913085759-bf90bf5eb77e // indirect
github.com/rancher/wrangler v0.0.0-20190426050201-5946f0eaed19 // indirect
github.com/twpayne/go-vfs v1.5.0 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/twpayne/go-vfs/v4 v4.3.0 // indirect
github.com/u-root/uio v0.0.0-20210528114334-82958018845c // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
github.com/vishvananda/netns v0.0.4 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/text v0.16.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/utils v0.0.0-20221011040102-427025108f67 // indirect
)
Expand Down
259 changes: 66 additions & 193 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

"github.com/imdario/mergo"
yipSchema "github.com/mudler/yip/pkg/schema"
yipSchema "github.com/rancher/yip/pkg/schema"
"k8s.io/apimachinery/pkg/util/validation"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/cos.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"sync"

yipSchema "github.com/mudler/yip/pkg/schema"
yipSchema "github.com/rancher/yip/pkg/schema"
"github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/cos_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"
"testing"

yipSchema "github.com/mudler/yip/pkg/schema"
yipSchema "github.com/rancher/yip/pkg/schema"
"github.com/stretchr/testify/assert"

"github.com/harvester/harvester-installer/pkg/util"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os/exec"
"syscall"

yipSchema "github.com/mudler/yip/pkg/schema"
yipSchema "github.com/rancher/yip/pkg/schema"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"time"

"github.com/jroimartin/gocui"
yipSchema "github.com/mudler/yip/pkg/schema"
"github.com/pkg/errors"
yipSchema "github.com/rancher/yip/pkg/schema"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
"golang.org/x/net/http/httpproxy"
Expand Down
188 changes: 0 additions & 188 deletions vendor/github.com/coreos/yaml/LICENSE

This file was deleted.

31 changes: 0 additions & 31 deletions vendor/github.com/coreos/yaml/LICENSE.libyaml

This file was deleted.

Loading
Loading