diff --git a/go.mod b/go.mod index fda8e28f..6e6bf95a 100644 --- a/go.mod +++ b/go.mod @@ -36,6 +36,8 @@ require ( require ( github.com/containernetworking/cni v1.1.2 + github.com/docker/distribution v2.8.1+incompatible + github.com/google/gopacket v1.1.19 github.com/google/uuid v1.3.0 github.com/hashicorp/go-version v1.6.0 github.com/kevinburke/ssh_config v1.2.0 @@ -44,13 +46,14 @@ require ( github.com/prometheus-community/pro-bing v0.1.0 github.com/schollz/progressbar/v3 v3.13.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.1 go.uber.org/automaxprocs v1.5.1 golang.org/x/crypto v0.2.0 golang.org/x/exp v0.0.0-20230113213754-f9f960f08ad4 golang.org/x/oauth2 v0.4.0 golang.org/x/text v0.6.0 + golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 k8s.io/utils v0.0.0-20230115233650-391b47cb4029 + sigs.k8s.io/kustomize/api v0.12.1 sigs.k8s.io/yaml v1.3.0 ) @@ -65,7 +68,6 @@ require ( github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 // indirect github.com/containerd/containerd v1.5.18 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect github.com/docker/go-metrics v0.0.1 // indirect @@ -86,7 +88,6 @@ require ( github.com/google/gnostic v0.6.9 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/gopacket v1.1.19 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect @@ -117,7 +118,6 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/runc v1.1.4 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.37.0 // indirect @@ -135,7 +135,6 @@ require ( golang.org/x/term v0.4.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.5.0 // indirect - golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -143,7 +142,6 @@ require ( k8s.io/component-base v0.26.1 // indirect k8s.io/kube-openapi v0.0.0-20230109183929-3758b55a6596 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kustomize/api v0.12.1 // indirect sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/pkg/tun/tun_windows.go b/pkg/tun/tun_windows.go index a8f6a747..886af761 100644 --- a/pkg/tun/tun_windows.go +++ b/pkg/tun/tun_windows.go @@ -13,6 +13,7 @@ import ( "github.com/containernetworking/cni/pkg/types" "github.com/pkg/errors" "golang.org/x/sys/windows" + wintun "golang.zx2c4.com/wintun" wireguardtun "golang.zx2c4.com/wireguard/tun" "golang.zx2c4.com/wireguard/windows/tunnel/winipcfg" @@ -104,6 +105,7 @@ func (c *winTunConn) Close() error { // _, err = wt.Delete(true) // } //} + wintun.Uninstall() return err }