Skip to content

Commit

Permalink
Merge pull request #4586 from k0sproject/backport-4561-to-release-1.29
Browse files Browse the repository at this point in the history
[Backport release-1.29] Bump kine to v0.11.10
  • Loading branch information
twz123 authored Jun 12, 2024
2 parents 649ef96 + 2646fc5 commit e18c677
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions embedded-bins/Makefile.variables
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ kubernetes_build_go_flags = "-v"
#kubernetes_build_go_ldflags =
kubernetes_build_go_ldflags_extra = "-extldflags=-static"

kine_version = 0.11.9
kine_version = 0.11.10
kine_buildimage = $(golang_buildimage)
#kine_build_go_tags =
#kine_build_go_cgo_enabled =
# Flags taken from https://github.com/k3s-io/kine/blob/v0.11.9/scripts/build#L22
# Flags taken from https://github.com/k3s-io/kine/blob/v0.11.10/scripts/build#L22
kine_build_go_cgo_cflags = -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_USE_ALLOCA=1

#kine_build_go_flags =
Expand Down
2 changes: 1 addition & 1 deletion pkg/component/controller/kine.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (k *Kine) Start(ctx context.Context) error {
fmt.Sprintf("--endpoint=%s", k.Config.DataSource),
// NB: kine doesn't parse URLs properly, so construct potentially
// invalid URLs that are understood by kine.
// https://github.com/k3s-io/kine/blob/v0.10.1/pkg/endpoint/endpoint.go#L277-L285
// https://github.com/k3s-io/kine/blob/v0.11.10/pkg/endpoint/endpoint.go#L250-L258
fmt.Sprintf("--listen-address=unix://%s", k.K0sVars.KineSocketPath),
},
UID: k.uid,
Expand Down

0 comments on commit e18c677

Please sign in to comment.