Update kine to v0.5.1 for compact fix

go.mod

@@ -100,7 +100,7 @@ require (
 	github.com/rakelkar/gonetsh v0.0.0-20190719023240-501daadcadf8 // indirect
 	github.com/rancher/dynamiclistener v0.2.0
 	github.com/rancher/helm-controller v0.6.5
-	github.com/rancher/kine v0.5.0
+	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

go.sum

@@ -636,8 +636,8 @@ github.com/rancher/helm-controller v0.6.5 h1:gL6R3fbsBFBnrp2Wc36zn0zLQ8q2ckbLpfa
 github.com/rancher/helm-controller v0.6.5/go.mod h1:ZylsxIMGNADRPRNW+NiBWhrwwks9vnKLQiCHYWb6Bi0=
 github.com/rancher/juju-to-pkg-errors v0.0.0-20200701001603-16f3c28b59bd h1:KPnQuOFWU6Jm7dTadhZ9TCVf6Y5NxoSyUjwkbD7En5Q=
 github.com/rancher/juju-to-pkg-errors v0.0.0-20200701001603-16f3c28b59bd/go.mod h1:QYmg8cqWPPfIbpEuhtJbEdWwA6PEKSY016Z6EdfL9+8=
-github.com/rancher/kine v0.5.0 h1:ot9ZInMCb0482aWfvO+3gI2B+e9vGxpY12EDJgpowiY=
-github.com/rancher/kine v0.5.0/go.mod h1:NoqDMfN0Q+Wu23Kk3MfXfgLO2fE6abLaetejZs9HAYo=
+github.com/rancher/kine v0.5.1 h1:pBAD9LVU3oCuRWzY6lKEVqhNi1nZlJV3bbD4G2mrE1c=
+github.com/rancher/kine v0.5.1/go.mod h1:NoqDMfN0Q+Wu23Kk3MfXfgLO2fE6abLaetejZs9HAYo=
 github.com/rancher/kubernetes v1.18.12-k3s1 h1:+hXEKCwvMFGPNNyvFIOPN52bJc8xcer6VZ7fz5Nu/OI=
 github.com/rancher/kubernetes v1.18.12-k3s1/go.mod h1:1uB7+7NGbXMLX7XOjMcXnk2Lc1v2J3NcBFDUTn1JkX8=
 github.com/rancher/kubernetes/staging/src/k8s.io/api v1.18.12-k3s1 h1:NaSzl7vG93KrUElE1CHI9lxIO9uDAwEHo8VsV0WJ598=

vendor/github.com/rancher/kine/pkg/drivers/mysql/mysql.go

@@ -74,6 +74,7 @@ func New(ctx context.Context, dataSourceName string, tlsInfo tls.Config, connPoo
 			SELECT kp.prev_revision AS id
 			FROM kine AS kp
 			WHERE
+				kp.name != 'compact_rev_key' AND
 				kp.prev_revision != 0 AND
 				kp.id <= ?
 			UNION
@@ -83,9 +84,7 @@ func New(ctx context.Context, dataSourceName string, tlsInfo tls.Config, connPoo
 				kd.deleted != 0 AND
 				kd.id <= ?
 		) AS ks
-		ON
-			kv.id = ks.id AND
-			kv.name != 'compact_rev_key'`
+		ON kv.id = ks.id`
 	dialect.TranslateErr = func(err error) error {
 		if err, ok := err.(*mysql.MySQLError); ok && err.Number == 1062 {
 			return server.ErrKeyExists

vendor/github.com/rancher/kine/pkg/drivers/pgsql/pgsql.go

@@ -64,6 +64,7 @@ func New(ctx context.Context, dataSourceName string, tlsInfo tls.Config, connPoo
 			SELECT kp.prev_revision AS id
 			FROM kine AS kp
 			WHERE
+				kp.name != 'compact_rev_key' AND
 				kp.prev_revision != 0 AND
 				kp.id <= $1
 			UNION
@@ -73,9 +74,7 @@ func New(ctx context.Context, dataSourceName string, tlsInfo tls.Config, connPoo
 				kd.deleted != 0 AND
 				kd.id <= $2
 		) AS ks
-		WHERE
-			kv.id = ks.id AND
-			kv.name != 'compact_rev_key'`
+		WHERE kv.id = ks.id`
 	dialect.TranslateErr = func(err error) error {
 		if err, ok := err.(*pq.Error); ok && err.Code == "23505" {
 			return server.ErrKeyExists

vendor/github.com/rancher/kine/pkg/drivers/sqlite/sqlite.go

@@ -64,11 +64,11 @@ func NewVariant(ctx context.Context, driverName, dataSourceName string, connPool
 	dialect.CompactSQL = `
 		DELETE FROM kine AS kv
 		WHERE
-			kv.name != 'compact_rev_key' AND
 			kv.id IN (
 				SELECT kp.prev_revision AS id
 				FROM kine AS kp
 				WHERE
+					kp.name != 'compact_rev_key' AND
 					kp.prev_revision != 0 AND
 					kp.id <= ?
 				UNION

vendor/modules.txt

@@ -739,7 +739,7 @@ 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.0
+# github.com/rancher/kine v0.5.1
 github.com/rancher/kine/pkg/broadcaster
 github.com/rancher/kine/pkg/client
 github.com/rancher/kine/pkg/drivers/dqlite