[migration k3s-io] update kine dependency (#2568)

README.md

@@ -36,7 +36,7 @@ K3s bundles the following technologies together into a single cohesive distribut
 * [Klipper-lb](https://github.com/rancher/klipper-lb) as an embedded service loadbalancer provider
 * [Kube-router](https://www.kube-router.io/) for network policy
 * [Helm-controller](https://github.com/rancher/helm-controller) to allow for CRD-driven deployment of helm manifests
-* [Kine](https://github.com/rancher/kine) as a datastore shim that allows etcd to be replaced with other databases
+* [Kine](https://github.com/k3s-io/kine) as a datastore shim that allows etcd to be replaced with other databases
 * [Local-path-provisioner](https://github.com/rancher/local-path-provisioner) for provisioning volumes using local storage
 * [Host utilities](https://github.com/rancher/k3s-root) such as iptables/nftables, ebtables, ethtool, & socat
 

go.mod

@@ -78,6 +78,7 @@ require (
 	github.com/google/uuid v1.1.1
 	github.com/gorilla/mux v1.7.4
 	github.com/gorilla/websocket v1.4.1
+	github.com/k3s-io/kine v0.6.0
 	github.com/kubernetes-sigs/cri-tools v0.0.0-00010101000000-000000000000
 	github.com/lib/pq v1.8.0
 	github.com/mattn/go-sqlite3 v1.14.4
@@ -88,7 +89,6 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rancher/dynamiclistener v0.2.1
 	github.com/rancher/helm-controller v0.7.3
-	github.com/rancher/kine v0.5.1
 	github.com/rancher/remotedialer v0.2.0
 	github.com/rancher/wrangler v0.6.1
 	github.com/rancher/wrangler-api v0.6.0

pkg/cluster/cluster.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"strings"
 
+	"github.com/k3s-io/kine/pkg/client"
+	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/pkg/errors"
 	"github.com/rancher/k3s/pkg/clientaccess"
 	"github.com/rancher/k3s/pkg/cluster/managed"
 	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/kine/pkg/client"
-	"github.com/rancher/kine/pkg/endpoint"
 )
 
 type Cluster struct {

pkg/cluster/managed.go

@@ -11,11 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rancher/k3s/pkg/etcd"
-
+	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/rancher/k3s/pkg/cluster/managed"
+	"github.com/rancher/k3s/pkg/etcd"
 	"github.com/rancher/k3s/pkg/version"
-	"github.com/rancher/kine/pkg/endpoint"
 	"github.com/sirupsen/logrus"
 )
 

pkg/cluster/storage.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"context"
 
+	"github.com/k3s-io/kine/pkg/client"
 	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/kine/pkg/client"
 )
 
 // save writes the current ControlRuntimeBootstrap data to the datastore. This contains a complete

pkg/daemons/config/types.go

@@ -9,7 +9,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/rancher/kine/pkg/endpoint"
+	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/rancher/wrangler-api/pkg/generated/controllers/core"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 )

vendor/github.com/rancher/kine/pkg/client/client.go → vendor/github.com/k3s-io/kine/pkg/client/client.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/rancher/kine/pkg/endpoint"
+	"github.com/k3s-io/kine/pkg/endpoint"
 	"go.etcd.io/etcd/clientv3"
 )
 

vendor/github.com/rancher/kine/pkg/drivers/dqlite/dqlite.go → vendor/github.com/k3s-io/kine/pkg/drivers/dqlite/dqlite.go

@@ -14,10 +14,10 @@ import (
 	"github.com/canonical/go-dqlite"
 	"github.com/canonical/go-dqlite/client"
 	"github.com/canonical/go-dqlite/driver"
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/drivers/sqlite"
+	"github.com/k3s-io/kine/pkg/server"
 	"github.com/pkg/errors"
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/drivers/sqlite"
-	"github.com/rancher/kine/pkg/server"
 	"github.com/sirupsen/logrus"
 )
 

vendor/github.com/rancher/kine/pkg/drivers/dqlite/no_dqlite.go → vendor/github.com/k3s-io/kine/pkg/drivers/dqlite/no_dqlite.go

@@ -6,8 +6,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/server"
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/server"
 )
 
 func New(ctx context.Context, datasourceName string, connPoolConfig generic.ConnectionPoolConfig) (server.Backend, error) {

vendor/github.com/rancher/kine/pkg/drivers/mysql/mysql.go → vendor/github.com/k3s-io/kine/pkg/drivers/mysql/mysql.go

@@ -6,11 +6,11 @@ import (
 	"database/sql"
 
 	"github.com/go-sql-driver/mysql"
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/logstructured"
-	"github.com/rancher/kine/pkg/logstructured/sqllog"
-	"github.com/rancher/kine/pkg/server"
-	"github.com/rancher/kine/pkg/tls"
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/logstructured"
+	"github.com/k3s-io/kine/pkg/logstructured/sqllog"
+	"github.com/k3s-io/kine/pkg/server"
+	"github.com/k3s-io/kine/pkg/tls"
 	"github.com/sirupsen/logrus"
 )
 

vendor/github.com/rancher/kine/pkg/drivers/pgsql/pgsql.go → vendor/github.com/k3s-io/kine/pkg/drivers/pgsql/pgsql.go

@@ -8,12 +8,12 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/logstructured"
+	"github.com/k3s-io/kine/pkg/logstructured/sqllog"
+	"github.com/k3s-io/kine/pkg/server"
+	"github.com/k3s-io/kine/pkg/tls"
 	"github.com/lib/pq"
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/logstructured"
-	"github.com/rancher/kine/pkg/logstructured/sqllog"
-	"github.com/rancher/kine/pkg/server"
-	"github.com/rancher/kine/pkg/tls"
 	"github.com/sirupsen/logrus"
 )
 

vendor/github.com/rancher/kine/pkg/drivers/sqlite/sqlite.go → vendor/github.com/k3s-io/kine/pkg/drivers/sqlite/sqlite.go

@@ -8,12 +8,12 @@ import (
 	"os"
 	"time"
 
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/logstructured"
+	"github.com/k3s-io/kine/pkg/logstructured/sqllog"
+	"github.com/k3s-io/kine/pkg/server"
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/logstructured"
-	"github.com/rancher/kine/pkg/logstructured/sqllog"
-	"github.com/rancher/kine/pkg/server"
 	"github.com/sirupsen/logrus"
 
 	// sqlite db driver

vendor/github.com/rancher/kine/pkg/drivers/sqlite/sqlite_nocgo.go → vendor/github.com/k3s-io/kine/pkg/drivers/sqlite/sqlite_nocgo.go

@@ -7,8 +7,8 @@ import (
 	"database/sql"
 	"errors"
 
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/server"
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/server"
 )
 
 var errNoCgo = errors.New("this binary is built without CGO, sqlite is disabled")

vendor/github.com/rancher/kine/pkg/endpoint/endpoint.go → vendor/github.com/k3s-io/kine/pkg/endpoint/endpoint.go

@@ -7,14 +7,14 @@ import (
 	"os"
 	"strings"
 
+	"github.com/k3s-io/kine/pkg/drivers/dqlite"
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/drivers/mysql"
+	"github.com/k3s-io/kine/pkg/drivers/pgsql"
+	"github.com/k3s-io/kine/pkg/drivers/sqlite"
+	"github.com/k3s-io/kine/pkg/server"
+	"github.com/k3s-io/kine/pkg/tls"
 	"github.com/pkg/errors"
-	"github.com/rancher/kine/pkg/drivers/dqlite"
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/drivers/mysql"
-	"github.com/rancher/kine/pkg/drivers/pgsql"
-	"github.com/rancher/kine/pkg/drivers/sqlite"
-	"github.com/rancher/kine/pkg/server"
-	"github.com/rancher/kine/pkg/tls"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 )

vendor/github.com/rancher/kine/pkg/logstructured/logstructured.go → vendor/github.com/k3s-io/kine/pkg/logstructured/logstructured.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rancher/kine/pkg/server"
+	"github.com/k3s-io/kine/pkg/server"
 	"github.com/sirupsen/logrus"
 )
 

vendor/github.com/rancher/kine/pkg/logstructured/sqllog/sql.go → vendor/github.com/k3s-io/kine/pkg/logstructured/sqllog/sql.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/kine/pkg/broadcaster"
+	"github.com/k3s-io/kine/pkg/drivers/generic"
+	"github.com/k3s-io/kine/pkg/server"
 	"github.com/pkg/errors"
-	"github.com/rancher/kine/pkg/broadcaster"
-	"github.com/rancher/kine/pkg/drivers/generic"
-	"github.com/rancher/kine/pkg/server"
 	"github.com/sirupsen/logrus"
 )
 

vendor/modules.txt

@@ -677,6 +677,20 @@ 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/kine v0.6.0
+## explicit
+github.com/k3s-io/kine/pkg/broadcaster
+github.com/k3s-io/kine/pkg/client
+github.com/k3s-io/kine/pkg/drivers/dqlite
+github.com/k3s-io/kine/pkg/drivers/generic
+github.com/k3s-io/kine/pkg/drivers/mysql
+github.com/k3s-io/kine/pkg/drivers/pgsql
+github.com/k3s-io/kine/pkg/drivers/sqlite
+github.com/k3s-io/kine/pkg/endpoint
+github.com/k3s-io/kine/pkg/logstructured
+github.com/k3s-io/kine/pkg/logstructured/sqllog
+github.com/k3s-io/kine/pkg/server
+github.com/k3s-io/kine/pkg/tls
 # github.com/karrick/godirwalk v1.7.5
 github.com/karrick/godirwalk
 # github.com/konsorten/go-windows-terminal-sequences v1.0.3
@@ -835,20 +849,6 @@ github.com/rancher/helm-controller/pkg/generated/informers/externalversions/helm
 github.com/rancher/helm-controller/pkg/generated/informers/externalversions/internalinterfaces
 github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1
 github.com/rancher/helm-controller/pkg/helm
-# github.com/rancher/kine v0.5.1
-## explicit
-github.com/rancher/kine/pkg/broadcaster
-github.com/rancher/kine/pkg/client
-github.com/rancher/kine/pkg/drivers/dqlite
-github.com/rancher/kine/pkg/drivers/generic
-github.com/rancher/kine/pkg/drivers/mysql
-github.com/rancher/kine/pkg/drivers/pgsql
-github.com/rancher/kine/pkg/drivers/sqlite
-github.com/rancher/kine/pkg/endpoint
-github.com/rancher/kine/pkg/logstructured
-github.com/rancher/kine/pkg/logstructured/sqllog
-github.com/rancher/kine/pkg/server
-github.com/rancher/kine/pkg/tls
 # github.com/rancher/remotedialer v0.2.0
 ## explicit
 github.com/rancher/remotedialer