Skip to content

Commit

Permalink
Pin down LXD and use dqlite LTS for microcluster (#464)
Browse files Browse the repository at this point in the history
This PR makes sure we always only pull the LXD dependency from
`@stable-5.21` and use microcluster `v2.0.5` which contains the dqlite
LTS.
  • Loading branch information
roosterfish authored Nov 7, 2024
2 parents 28fcfde + 1863768 commit 0a69e33
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 575 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ifeq "$(GOCOVERDIR)" ""
else
go install -tags=agent -v -cover ./cmd/microcloud
go install -tags=agent -v -cover ./cmd/microcloudd
endif
endif

# Testing targets.
.PHONY: check
Expand Down Expand Up @@ -46,7 +46,11 @@ endif
# Update targets.
.PHONY: update-gomod
update-gomod:
go get -u ./...
go get -t -v -u ./...

# Static pins
go get github.com/canonical/[email protected] # Stay on v2 dqlite and LXD LTS client

go mod tidy -go=$(GOMIN)

# Update lxd-generate generated database helpers.
Expand Down
20 changes: 10 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ go 1.22.7
require (
github.com/AlecAivazis/survey/v2 v2.3.7
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
github.com/canonical/lxd v0.0.0-20241022112222-538639622c38
github.com/canonical/lxd v0.0.0-20241106165613-4aab50ec18c3
github.com/canonical/microceph/microceph v0.0.0-20241021172252-2dd856d64c62
github.com/canonical/microcluster/v2 v2.0.4
github.com/canonical/microovn/microovn v0.0.0-20241018151920-4b82d2983810
github.com/charmbracelet/lipgloss v0.13.0
github.com/creack/pty v1.1.23
github.com/canonical/microcluster/v2 v2.0.5
github.com/canonical/microovn/microovn v0.0.0-20241101125123-0d5d663f6575
github.com/charmbracelet/lipgloss v1.0.0
github.com/creack/pty v1.1.24
github.com/gorilla/mux v1.8.1
github.com/gorilla/websocket v1.5.3
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02
Expand All @@ -29,11 +29,11 @@ require (
github.com/Rican7/retry v0.3.1 // indirect
github.com/armon/go-proxyproto v0.1.0 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/canonical/go-dqlite v1.22.0 // indirect
github.com/charmbracelet/x/ansi v0.3.2 // indirect
github.com/canonical/go-dqlite/v2 v2.0.0 // indirect
github.com/charmbracelet/x/ansi v0.4.5 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand All @@ -54,15 +54,15 @@ require (
github.com/muesli/termenv v0.15.2 // indirect
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.6 // indirect
github.com/pkg/sftp v1.13.7 // indirect
github.com/pkg/xattr v0.4.10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/zitadel/logging v0.6.1 // indirect
github.com/zitadel/oidc/v3 v3.31.0 // indirect
github.com/zitadel/oidc/v3 v3.32.1 // indirect
github.com/zitadel/schema v1.3.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
Expand Down
Loading

0 comments on commit 0a69e33

Please sign in to comment.