Skip to content

Commit

Permalink
Merge pull request k0sproject#4797 from twz123/bump-kine
Browse files Browse the repository at this point in the history
Bump kine to v0.11.12
  • Loading branch information
twz123 authored Jul 24, 2024
2 parents 6d083b0 + 9034614 commit 25941d8
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.11
kine_version = 0.11.12
kine_buildimage = $(golang_buildimage)
kine_build_go_tags = nats
#kine_build_go_cgo_enabled =
# Flags taken from https://github.com/k3s-io/kine/blob/v0.11.11/scripts/build#L22
# Flags taken from https://github.com/k3s-io/kine/blob/v0.11.12/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 @@ -114,7 +114,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.11.11/pkg/endpoint/endpoint.go#L250-L258
// https://github.com/k3s-io/kine/blob/v0.11.12/pkg/endpoint/endpoint.go#L250-L258
fmt.Sprintf("--listen-address=unix://%s", k.K0sVars.KineSocketPath),
// Enable metrics on port 2380. The default is 8080, which clashes with kube-router.
"--metrics-bind-address=:2380",
Expand Down

0 comments on commit 25941d8

Please sign in to comment.