diff --git a/go.mod b/go.mod index bc143183e24..676a6d44910 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.9 - github.com/benmoss/go-powershell => github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 + github.com/benmoss/go-powershell => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 github.com/containerd/btrfs => github.com/containerd/btrfs v0.0.0-20181101203652-af5082808c83 github.com/containerd/cgroups => github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 github.com/containerd/console => github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 @@ -14,7 +14,7 @@ replace ( github.com/containerd/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c github.com/containerd/go-runc => github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328 github.com/containerd/typeurl => github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd - github.com/coreos/flannel => github.com/rancher/flannel v0.12.0-k3s1 + github.com/coreos/flannel => github.com/k3s-io/flannel v0.12.0-k3s2 github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e github.com/docker/distribution => github.com/docker/distribution v0.0.0-20190205005809-0d3efadf0154 github.com/docker/docker => github.com/docker/docker v17.12.0-ce-rc1.0.20190219214528-cbe11bdc6da8+incompatible diff --git a/go.sum b/go.sum index 37dc942bcba..4e06b2cd56a 100644 --- a/go.sum +++ b/go.sum @@ -472,6 +472,12 @@ github.com/k3s-io/cri-tools v1.19.0-k3s1 h1:FQ1iURavoP3rE/GqND/f3aIL1X59IpFQCRnD github.com/k3s-io/cri-tools v1.19.0-k3s1/go.mod h1:bitvtZRi5F7t505Yw3zPzp22LOao1lqJKHfx6x0hnpw= github.com/k3s-io/etcd v0.0.0-20200911210206-f8fde3601008 h1:PlAf/spqR2ZVFeWORItuvYk0YNDsjTlmq+e+7TQbtrI= github.com/k3s-io/etcd v0.0.0-20200911210206-f8fde3601008/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= +github.com/k3s-io/flannel v0.12.0-k3s2 h1:KEfj4fe+P0qINcYZxo5/C0cga2XBEfeV4nhKrUGDyCg= +github.com/k3s-io/flannel v0.12.0-k3s2/go.mod h1:2tCkIFWhim43MkRsOcPOxY8/Bcpai9uZLJaywN7ciNg= +github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:9naOL3iAREsJh9mbf9C6Qqu9xuFv7/jIGBFCWvZMg4E= +github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:lsDHcxq5ugFJff6YHEwpzLh31NDv0B2cIKki1ViQ65o= +github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 h1:C+6IIP6yECS10qkq2EeGQjr2ts0k7UxrutGF+pLPSnU= +github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7/go.mod h1:wJnuh+xbDmskSfAM3UikTsGO8kaWLu3iycSgUKAiYjQ= github.com/k3s-io/kine v0.6.0 h1:4l7wjgCxb2oD+7Hyf3xIhkGd/6s1sXpRFdQiyy+7Ki8= github.com/k3s-io/kine v0.6.0/go.mod h1:rzCs93+rQHZGOiewMd84PDrER92QeZ6eeHbWkfEy4+w= github.com/k3s-io/kubernetes v1.19.4-k3s1 h1:6ehWJYzSUobbOoKaSnt9O0vbpunkVKeH7kU38ZtWEno= @@ -699,12 +705,6 @@ github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0 h1:iXE9kmlAqhusXx github.com/rakelkar/gonetsh v0.0.0-20190930180311-e5c5ffe4bdf0/go.mod h1:4XHkfaUj+URzGO9sohoAgt2V9Y8nIW7fugpu0E6gShk= github.com/rancher/dynamiclistener v0.2.1 h1:QiY1jxs2TOLrKB04G36vE2ehEvPMPGiWp8zEHLKB1nE= github.com/rancher/dynamiclistener v0.2.1/go.mod h1:9WusTANoiRr8cDWCTtf5txieulezHbpv4vhLADPp0zU= -github.com/rancher/flannel v0.12.0-k3s1 h1:P23dWSk/9mGT1x2rDWW9JXNrF/0kjftiHwMau/+ZLGM= -github.com/rancher/flannel v0.12.0-k3s1/go.mod h1:zQ/9Uhaw0yV4Wh6ljVwHVT1x5KuhenZA+6L8lRzOJEY= -github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 h1:UeC0rjrIel8hHz92cdVN09Cm4Hz+BhsPP/ZvQnPOr58= -github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79/go.mod h1:xi4WpK6Op4m1Lknq61/e+VSjYlTs9bulVOaDNyBdzvk= -github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 h1:BePi97poJ4hXnkP9yX96EmNQgMg+dGScvB1sqIheJ7w= -github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373/go.mod h1:Vz8oLnHgttpo/aZrTpjbcpZEDzzElqNau2zmorToY0E= github.com/rancher/helm-controller v0.7.3 h1:WTQHcNF2vl9w6Xd1eBtXDe0JUsYMFFstqX9ghGhI5Ac= github.com/rancher/helm-controller v0.7.3/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0= github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U= diff --git a/vendor/github.com/benmoss/go-powershell/README.md b/vendor/github.com/benmoss/go-powershell/README.md index 878055f6dcc..8a2667dc765 100644 --- a/vendor/github.com/benmoss/go-powershell/README.md +++ b/vendor/github.com/benmoss/go-powershell/README.md @@ -1,5 +1,9 @@ # go-powershell +_NOTE: this repository has been recently (2020-11-18) moved out of the github.com/rancher org to github.com/k3s-io +supporting the [acceptance of K3s as a CNCF sandbox project](https://github.com/cncf/toc/pull/447)_. +--- + This package is inspired by [jPowerShell](https://github.com/profesorfalken/jPowerShell) and allows one to run and remote-control a PowerShell session. Use this if you don't have a static script that you want to execute, bur rather run dynamic @@ -7,7 +11,7 @@ commands. ## Installation - go get github.com/rancher/go-powershell + go get github.com/k3s-io/go-powershell ## Usage @@ -21,8 +25,8 @@ package main import ( "fmt" - ps "github.com/rancher/go-powershell" - "github.com/rancher/go-powershell/backend" + ps "github.com/k3s-io/go-powershell" + "github.com/k3s-io/go-powershell/backend" ) func main() { @@ -59,9 +63,9 @@ package main import ( "fmt" - ps "github.com/rancher/go-powershell" - "github.com/rancher/go-powershell/backend" - "github.com/rancher/go-powershell/middleware" + ps "github.com/k3s-io/go-powershell" + "github.com/k3s-io/go-powershell/backend" + "github.com/k3s-io/go-powershell/middleware" ) func main() { diff --git a/vendor/github.com/benmoss/go-powershell/go.mod b/vendor/github.com/benmoss/go-powershell/go.mod index 7c34a997fc8..1372afaefb4 100644 --- a/vendor/github.com/benmoss/go-powershell/go.mod +++ b/vendor/github.com/benmoss/go-powershell/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/go-powershell +module github.com/k3s-io/go-powershell go 1.14 diff --git a/vendor/github.com/benmoss/go-powershell/shell.go b/vendor/github.com/benmoss/go-powershell/shell.go index 4c123b58bff..0c99bc210bf 100644 --- a/vendor/github.com/benmoss/go-powershell/shell.go +++ b/vendor/github.com/benmoss/go-powershell/shell.go @@ -8,8 +8,8 @@ import ( "regexp" "sync" - "github.com/rancher/go-powershell/backend" - "github.com/rancher/go-powershell/utils" + "github.com/k3s-io/go-powershell/backend" + "github.com/k3s-io/go-powershell/utils" "github.com/pkg/errors" ) diff --git a/vendor/github.com/rancher/go-powershell/LICENSE b/vendor/github.com/k3s-io/go-powershell/LICENSE similarity index 100% rename from vendor/github.com/rancher/go-powershell/LICENSE rename to vendor/github.com/k3s-io/go-powershell/LICENSE diff --git a/vendor/github.com/rancher/go-powershell/backend/local.go b/vendor/github.com/k3s-io/go-powershell/backend/local.go similarity index 100% rename from vendor/github.com/rancher/go-powershell/backend/local.go rename to vendor/github.com/k3s-io/go-powershell/backend/local.go diff --git a/vendor/github.com/rancher/go-powershell/backend/ssh.go b/vendor/github.com/k3s-io/go-powershell/backend/ssh.go similarity index 100% rename from vendor/github.com/rancher/go-powershell/backend/ssh.go rename to vendor/github.com/k3s-io/go-powershell/backend/ssh.go diff --git a/vendor/github.com/rancher/go-powershell/backend/types.go b/vendor/github.com/k3s-io/go-powershell/backend/types.go similarity index 100% rename from vendor/github.com/rancher/go-powershell/backend/types.go rename to vendor/github.com/k3s-io/go-powershell/backend/types.go diff --git a/vendor/github.com/rancher/go-powershell/utils/quote.go b/vendor/github.com/k3s-io/go-powershell/utils/quote.go similarity index 100% rename from vendor/github.com/rancher/go-powershell/utils/quote.go rename to vendor/github.com/k3s-io/go-powershell/utils/quote.go diff --git a/vendor/github.com/rancher/go-powershell/utils/rand.go b/vendor/github.com/k3s-io/go-powershell/utils/rand.go similarity index 100% rename from vendor/github.com/rancher/go-powershell/utils/rand.go rename to vendor/github.com/k3s-io/go-powershell/utils/rand.go diff --git a/vendor/modules.txt b/vendor/modules.txt index c67dc3feddf..7d86fdbe163 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -130,7 +130,7 @@ github.com/aws/aws-sdk-go/service/elbv2 github.com/aws/aws-sdk-go/service/kms github.com/aws/aws-sdk-go/service/sts github.com/aws/aws-sdk-go/service/sts/stsiface -# github.com/benmoss/go-powershell v0.0.0-00010101000000-000000000000 => github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 +# github.com/benmoss/go-powershell v0.0.0-00010101000000-000000000000 => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 github.com/benmoss/go-powershell github.com/benmoss/go-powershell/backend # github.com/beorn7/perks v1.0.1 @@ -380,7 +380,7 @@ github.com/containers/ocicrypt/keywrap/pgp github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils -# github.com/coreos/flannel v0.12.0 => github.com/rancher/flannel v0.12.0-k3s1 +# github.com/coreos/flannel v0.12.0 => github.com/k3s-io/flannel v0.12.0-k3s2 ## explicit github.com/coreos/flannel/backend github.com/coreos/flannel/backend/extension @@ -678,6 +678,9 @@ github.com/jmespath/go-jmespath github.com/jonboulle/clockwork # github.com/json-iterator/go v1.1.10 github.com/json-iterator/go +# github.com/k3s-io/go-powershell v0.0.0-20200701182037-6845e6fcfa79 +github.com/k3s-io/go-powershell/backend +github.com/k3s-io/go-powershell/utils # github.com/k3s-io/kine v0.6.0 ## explicit github.com/k3s-io/kine/pkg/broadcaster @@ -832,9 +835,6 @@ github.com/rancher/dynamiclistener/factory github.com/rancher/dynamiclistener/storage/file github.com/rancher/dynamiclistener/storage/kubernetes github.com/rancher/dynamiclistener/storage/memory -# github.com/rancher/go-powershell v0.0.0-20200701182037-6845e6fcfa79 -github.com/rancher/go-powershell/backend -github.com/rancher/go-powershell/utils # github.com/rancher/helm-controller v0.7.3 ## explicit github.com/rancher/helm-controller/pkg/apis/helm.cattle.io @@ -2924,7 +2924,7 @@ sigs.k8s.io/yaml # vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc vbom.ml/util/sortorder # github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.9 -# github.com/benmoss/go-powershell => github.com/rancher/go-powershell v0.0.0-20200701184732-233247d45373 +# github.com/benmoss/go-powershell => github.com/k3s-io/go-powershell v0.0.0-20201118222746-51f4c451fbd7 # github.com/containerd/btrfs => github.com/containerd/btrfs v0.0.0-20181101203652-af5082808c83 # github.com/containerd/cgroups => github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 # github.com/containerd/console => github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50 @@ -2934,7 +2934,7 @@ vbom.ml/util/sortorder # github.com/containerd/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c # github.com/containerd/go-runc => github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328 # github.com/containerd/typeurl => github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd -# github.com/coreos/flannel => github.com/rancher/flannel v0.12.0-k3s1 +# github.com/coreos/flannel => github.com/k3s-io/flannel v0.12.0-k3s2 # github.com/coreos/go-systemd => github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e # github.com/docker/distribution => github.com/docker/distribution v0.0.0-20190205005809-0d3efadf0154 # github.com/docker/docker => github.com/docker/docker v17.12.0-ce-rc1.0.20190219214528-cbe11bdc6da8+incompatible