github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update kine to v0.5.1 for compact fix 

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/2544/head v1.18.12+k3s1
Brad Davidson 2020-11-12 19:38:53 -08:00 committed by Brad Davidson
parent 0bd92448b0
commit 56cd36302d
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

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

4
go.sum
View File

@ -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/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 h1:KPnQuOFWU6Jm7dTadhZ9TCVf6Y5NxoSyUjwkbD7En5Q=
github.com/rancher/juju-to-pkg-errors v0.0.0-20200701001603-16f3c28b59bd/go.mod h1:QYmg8cqWPPfIbpEuhtJbEdWwA6PEKSY016Z6EdfL9+8= 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.1 h1:pBAD9LVU3oCuRWzY6lKEVqhNi1nZlJV3bbD4G2mrE1c=
github.com/rancher/kine v0.5.0/go.mod h1:NoqDMfN0Q+Wu23Kk3MfXfgLO2fE6abLaetejZs9HAYo= 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 h1:+hXEKCwvMFGPNNyvFIOPN52bJc8xcer6VZ7fz5Nu/OI=
github.com/rancher/kubernetes v1.18.12-k3s1/go.mod h1:1uB7+7NGbXMLX7XOjMcXnk2Lc1v2J3NcBFDUTn1JkX8= 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= github.com/rancher/kubernetes/staging/src/k8s.io/api v1.18.12-k3s1 h1:NaSzl7vG93KrUElE1CHI9lxIO9uDAwEHo8VsV0WJ598=

5
vendor/github.com/rancher/kine/pkg/drivers/mysql/mysql.go generated vendored
View File

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

5
vendor/github.com/rancher/kine/pkg/drivers/pgsql/pgsql.go generated vendored
View File

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

2
vendor/github.com/rancher/kine/pkg/drivers/sqlite/sqlite.go generated vendored
View File

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

2
vendor/modules.txt vendored
View File

@ -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/informers/externalversions/internalinterfaces
github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1 github.com/rancher/helm-controller/pkg/generated/listers/helm.cattle.io/v1
github.com/rancher/helm-controller/pkg/helm 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/broadcaster
github.com/rancher/kine/pkg/client github.com/rancher/kine/pkg/client
github.com/rancher/kine/pkg/drivers/dqlite github.com/rancher/kine/pkg/drivers/dqlite