Skip to content

Commit

Permalink
Merge pull request #276 from MggMuggins/update-gomod
Browse files Browse the repository at this point in the history
Update gomod
  • Loading branch information
MggMuggins authored Apr 11, 2024
2 parents 81d501c + 616d959 commit a28d437
Show file tree
Hide file tree
Showing 11 changed files with 117 additions and 142 deletions.
8 changes: 7 additions & 1 deletion microcloud/cmd/microcloud/ask.go
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,13 @@ func (c *CmdControl) askRemotePool(systems map[string]InitSystem, autoSetup bool
system.MicroCephDisks = []cephTypes.DisksPost{}
}

system.MicroCephDisks = append(system.MicroCephDisks, cephTypes.DisksPost{Path: path, Wipe: wipeMap[entry]})
system.MicroCephDisks = append(
system.MicroCephDisks,
cephTypes.DisksPost{
Path: []string{path},
Wipe: wipeMap[entry],
},
)

systems[target] = system
}
Expand Down
2 changes: 1 addition & 1 deletion microcloud/cmd/microcloud/main_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ func setupCluster(s *service.Handler, systems map[string]InitSystem) error {
}

logger.Debug("Adding disk to MicroCeph", logger.Ctx{"peer": s.Name, "disk": disk.Path})
err = cephClient.AddDisk(context.Background(), c, &disk)
_, err = cephClient.AddDisk(context.Background(), c, &disk)
if err != nil {
return err
}
Expand Down
16 changes: 14 additions & 2 deletions microcloud/cmd/microcloud/main_init_preseed.go
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,13 @@ func (p *Preseed) Parse(s *service.Handler, bootstrap bool) (map[string]InitSyst
}

for _, disk := range directCeph {
system.MicroCephDisks = append(system.MicroCephDisks, cephTypes.DisksPost{Path: disk.Path, Wipe: disk.Wipe})
system.MicroCephDisks = append(
system.MicroCephDisks,
cephTypes.DisksPost{
Path: []string{disk.Path},
Wipe: disk.Wipe,
},
)
}

// Setup ceph pool for disks specified to MicroCeph.
Expand Down Expand Up @@ -566,7 +572,13 @@ func (p *Preseed) Parse(s *service.Handler, bootstrap bool) (map[string]InitSyst
}

for _, disk := range matched {
system.MicroCephDisks = append(system.MicroCephDisks, cephTypes.DisksPost{Path: parseDiskPath(disk), Wipe: filter.Wipe})
system.MicroCephDisks = append(
system.MicroCephDisks,
cephTypes.DisksPost{
Path: []string{parseDiskPath(disk)},
Wipe: filter.Wipe,
},
)
// There should only be one ceph pool per system.
if !addedCephPool {
if bootstrap {
Expand Down
51 changes: 21 additions & 30 deletions microcloud/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ go 1.22.0
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-20231130101148-2b5ed73f449c
github.com/canonical/microceph/microceph v0.0.0-20231129113725-4a608fc15c50
github.com/canonical/microcluster v0.0.0-20231129081021-39c3a6d3e1b6
github.com/canonical/microovn/microovn v0.0.0-20231129183004-7237b4f6031b
github.com/canonical/lxd v0.0.0-20240403135607-df45915ce961
github.com/canonical/microceph/microceph v0.0.0-20240403035153-450240f5dd0d
github.com/canonical/microcluster v0.0.0-20240403200531-257dd2e18a69
github.com/canonical/microovn/microovn v0.0.0-20240312054843-707732e1c252
github.com/creack/pty v1.1.21
github.com/hashicorp/mdns v1.0.5
github.com/hinshun/vt10x v0.0.0-20220301184237-5011da428d02
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -26,54 +26,45 @@ require (
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.1 // indirect
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/renameio v1.0.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/mux v1.8.1 // indirect
github.com/gorilla/schema v1.2.1 // indirect
github.com/gorilla/schema v1.3.0 // indirect
github.com/gorilla/securecookie v1.1.2 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/juju/webbrowser v1.0.0 // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-sqlite3 v1.14.18 // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/miekg/dns v1.1.57 // indirect
github.com/miekg/dns v1.1.58 // indirect
github.com/muhlemmer/gu v0.3.1 // indirect
github.com/openfga/go-sdk v0.2.3 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/sftp v1.13.6 // indirect
github.com/pkg/xattr v0.4.9 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rogpeppe/fastuuid v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/zitadel/oidc/v2 v2.12.0 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.16.0 // indirect
golang.org/x/tools v0.19.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/errgo.v1 v1.0.1 // indirect
gopkg.in/httprequest.v1 v1.2.1 // indirect
gopkg.in/macaroon.v2 v2.1.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)
Loading

0 comments on commit a28d437

Please sign in to comment.