Skip to content

Commit 8ff3a5d

Browse files
CMGSCMGS
committed
use latest core
1 parent 5c916d9 commit 8ff3a5d

File tree

6 files changed

+151
-1009
lines changed

6 files changed

+151
-1009
lines changed

‎cmd/node/cmd.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,29 +134,29 @@ func Command() *cli.Command {
134134
this value can be set multiple times, the index will be the numa node ID,
135135
e.g. --numa-memory 10G --numa-memory 15G, means node ID 0 will be 10GB, node ID 1 will be 15GB`,
136136
},
137-
// &cli.StringFlag{
138-
// Name: "storage",
139-
// Usage: `storage, unit can be K/M/G/T,
140-
// when using --delta flag, this can be a negtive number indicating how much to add to the current value,
141-
// e.g. --storage -10G --delta, means storage will be the current value - 10`,
142-
// },
143-
// &cli.StringSliceFlag{
144-
// Name: "volume",
145-
// Usage: `volume value in string, can set multiple times. e.g. "--volume /data:100G",
146-
// when using --delta flag, this can be a negative number indicating how much to add to the current value,
147-
// e.g. --volume /data0:-10G --volume /data1:20G, means /data0 will be subtract 10G and /data1 will be added 20G`,
148-
// },
149-
// &cli.StringSliceFlag{
150-
// Name: "disk",
151-
// Usage: `disk value in string, format: device:mounts:read-iops:write-iops:read-bps:write-bps
152-
// e.g. --disk /dev/sda1:/data0:100:100:100M:100M
153-
// when using --delta flag, this can be a negative number indicating how much to add to the current value`,
154-
// },
155-
// &cli.StringFlag{
156-
// Name: "rm-disk",
157-
// Usage: `remove disks, e.g. --rm-disk /dev/vda,/dev/vdb
158-
// rm-disk is not supported in delta mode`,
159-
// },
137+
&cli.StringFlag{
138+
Name: "storage",
139+
Usage: `storage, unit can be K/M/G/T,
140+
when using --delta flag, this can be a negtive number indicating how much to add to the current value,
141+
e.g. --storage -10G --delta, means storage will be the current value - 10`,
142+
},
143+
&cli.StringSliceFlag{
144+
Name: "volume",
145+
Usage: `volume value in string, can set multiple times. e.g. "--volume /data:100G",
146+
when using --delta flag, this can be a negative number indicating how much to add to the current value,
147+
e.g. --volume /data0:-10G --volume /data1:20G, means /data0 will be subtract 10G and /data1 will be added 20G`,
148+
},
149+
&cli.StringSliceFlag{
150+
Name: "disk",
151+
Usage: `disk value in string, format: device:mounts:read-iops:write-iops:read-bps:write-bps
152+
e.g. --disk /dev/sda1:/data0:100:100:100M:100M
153+
when using --delta flag, this can be a negative number indicating how much to add to the current value`,
154+
},
155+
&cli.StringFlag{
156+
Name: "rm-disk",
157+
Usage: `remove disks, e.g. --rm-disk /dev/vda,/dev/vdb
158+
rm-disk is not supported in delta mode`,
159+
},
160160
&cli.StringSliceFlag{
161161
Name: "label",
162162
Usage: "label for the node, can set multiple times, e.g. --label a=1 --label b=2",

‎cmd/node/get.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import (
1212
)
1313

1414
type getNodeOptions struct {
15-
client corepb.CoreRPCClient
16-
plugins []string
17-
name string
15+
client corepb.CoreRPCClient
16+
name string
1817
}
1918

2019
func (o *getNodeOptions) run(ctx context.Context) error {

‎cmd/node/set.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func generateSetNodeOptions(c *cli.Context, _ corepb.CoreRPCClient) (*corepb.Set
6161
}
6262

6363
cpumem := resourcetypes.RawParams{}
64-
// storage := resourcetypes.RawParams{}
64+
storage := resourcetypes.RawParams{}
6565

6666
if c.IsSet("cpu") {
6767
cpumem["cpu"] = c.String("cpu")
@@ -78,24 +78,24 @@ func generateSetNodeOptions(c *cli.Context, _ corepb.CoreRPCClient) (*corepb.Set
7878
if c.IsSet("numa-memory") {
7979
cpumem["numa-memory"] = c.StringSlice("numa-memory")
8080
}
81-
// if c.IsSet("disk") {
82-
// storage["disks"] = c.StringSlice("disk")
83-
// }
84-
// if c.IsSet("storage") {
85-
// storage["storage"] = c.String("storage")
86-
// }
87-
// if c.IsSet("volume") {
88-
// storage["volumes"] = c.StringSlice("volume")
89-
// }
90-
// if c.IsSet("rm-disk") {
91-
// storage["rm-disks"] = c.String("rm-disk")
92-
// }
81+
if c.IsSet("disk") {
82+
storage["disks"] = c.StringSlice("disk")
83+
}
84+
if c.IsSet("storage") {
85+
storage["storage"] = c.String("storage")
86+
}
87+
if c.IsSet("volume") {
88+
storage["volumes"] = c.StringSlice("volume")
89+
}
90+
if c.IsSet("rm-disk") {
91+
storage["rm-disks"] = c.String("rm-disk")
92+
}
9393

9494
cb, _ := json.Marshal(cpumem)
95-
// sb, _ := json.Marshal(storage)
95+
sb, _ := json.Marshal(storage)
9696
resources := map[string][]byte{
97-
"cpumem": cb,
98-
// "storage": sb,
97+
"cpumem": cb,
98+
"storage": sb,
9999
}
100100

101101
return &corepb.SetNodeOptions{

‎cmd/pod/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func attr(nr *corepb.NodeResource, name string) float64 {
5050
if err != nil {
5151
return 0.0
5252
}
53-
switch { //nolint
53+
switch {
5454
case name == "cpu":
5555
return cr["cpu"]
5656
case name == "memory":

‎go.mod

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,81 +7,77 @@ require (
77
github.com/getlantern/deepcopy v0.0.0-20160317154340-7f45deb8130a
88
github.com/ghodss/yaml v1.0.0
99
github.com/google/uuid v1.3.0
10-
github.com/jedib0t/go-pretty/v6 v6.0.6
10+
github.com/jedib0t/go-pretty/v6 v6.4.4
1111
github.com/juju/errors v1.0.0
1212
github.com/pkg/term v1.1.0
13-
github.com/projecteru2/core v0.0.0-20221101084940-0899829619a5
13+
github.com/projecteru2/core v0.0.0-20230206041219-19ba952bf7a2
1414
github.com/sethgrid/curse v0.0.0-20181231162520-d4ee583ebf0f
15-
github.com/sethvargo/go-signalcontext v0.1.0
15+
github.com/sethvargo/go-signalcontext v0.2.1
1616
github.com/sirupsen/logrus v1.9.0
17-
github.com/urfave/cli/v2 v2.23.7
18-
golang.org/x/sys v0.2.0
17+
github.com/urfave/cli/v2 v2.24.3
18+
golang.org/x/sys v0.4.0
1919
gopkg.in/yaml.v2 v2.4.0
2020
)
2121

2222
require (
23-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
23+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
2424
github.com/BurntSushi/toml v1.2.1 // indirect
2525
github.com/Microsoft/go-winio v0.6.0 // indirect
26-
github.com/Microsoft/hcsshim v0.9.6 // indirect
2726
github.com/alphadose/haxmap v1.2.0 // indirect
2827
github.com/beorn7/perks v1.0.1 // indirect
2928
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
30-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
31-
github.com/cockroachdb/errors v1.9.0 // indirect
32-
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
29+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
30+
github.com/cockroachdb/errors v1.9.1 // indirect
31+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
3332
github.com/cockroachdb/redact v1.1.3 // indirect
34-
github.com/containerd/cgroups v1.0.4 // indirect
35-
github.com/containerd/containerd v1.6.13 // indirect
33+
github.com/containerd/containerd v1.6.16 // indirect
3634
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
3735
github.com/docker/distribution v2.8.1+incompatible // indirect
38-
github.com/docker/docker v20.10.22+incompatible // indirect
36+
github.com/docker/docker v23.0.0+incompatible // indirect
3937
github.com/docker/go-connections v0.4.0 // indirect
4038
github.com/docker/go-metrics v0.0.1 // indirect
41-
github.com/getsentry/sentry-go v0.16.0 // indirect
39+
github.com/getsentry/sentry-go v0.17.0 // indirect
4240
github.com/go-ping/ping v1.1.0 // indirect
4341
github.com/gogo/protobuf v1.3.2 // indirect
44-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4542
github.com/golang/protobuf v1.5.2 // indirect
4643
github.com/gorilla/mux v1.8.0 // indirect
4744
github.com/jinzhu/configor v1.2.1 // indirect
45+
github.com/klauspost/compress v1.15.15 // indirect
4846
github.com/kless/term v0.0.0-20161130133337-e551c64f56c0 // indirect
49-
github.com/kr/pretty v0.3.0 // indirect
47+
github.com/kr/pretty v0.3.1 // indirect
5048
github.com/kr/text v0.2.0 // indirect
5149
github.com/mattn/go-colorable v0.1.13 // indirect
52-
github.com/mattn/go-isatty v0.0.16 // indirect
53-
github.com/mattn/go-runewidth v0.0.9 // indirect
50+
github.com/mattn/go-isatty v0.0.17 // indirect
51+
github.com/mattn/go-runewidth v0.0.14 // indirect
5452
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5553
github.com/mitchellh/mapstructure v1.5.0 // indirect
56-
github.com/moby/sys/mount v0.3.3 // indirect
57-
github.com/moby/sys/mountinfo v0.6.2 // indirect
58-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
54+
github.com/moby/patternmatcher v0.5.0 // indirect
55+
github.com/moby/sys/sequential v0.5.0 // indirect
56+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
5957
github.com/morikuni/aec v1.0.0 // indirect
6058
github.com/opencontainers/go-digest v1.0.0 // indirect
6159
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
6260
github.com/opencontainers/runc v1.1.4 // indirect
63-
github.com/panjf2000/ants/v2 v2.7.0 // indirect
61+
github.com/panjf2000/ants/v2 v2.7.1 // indirect
6462
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
6563
github.com/pkg/errors v0.9.1 // indirect
66-
github.com/prometheus/client_golang v1.13.0 // indirect
67-
github.com/prometheus/client_model v0.2.0 // indirect
68-
github.com/prometheus/common v0.37.0 // indirect
69-
github.com/prometheus/procfs v0.8.0 // indirect
70-
github.com/rogpeppe/go-internal v1.8.1 // indirect
71-
github.com/rs/zerolog v1.28.0 // indirect
64+
github.com/prometheus/client_golang v1.14.0 // indirect
65+
github.com/prometheus/client_model v0.3.0 // indirect
66+
github.com/prometheus/common v0.39.0 // indirect
67+
github.com/prometheus/procfs v0.9.0 // indirect
68+
github.com/rivo/uniseg v0.4.3 // indirect
69+
github.com/rogpeppe/go-internal v1.9.0 // indirect
70+
github.com/rs/zerolog v1.29.0 // indirect
7271
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7372
github.com/tredoe/term v0.0.0-20161130133337-e551c64f56c0 // indirect
7473
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
75-
go.opencensus.io v0.23.0 // indirect
76-
golang.org/x/exp v0.0.0-20221217163422-3c43f8badb15 // indirect
77-
golang.org/x/mod v0.6.0 // indirect
78-
golang.org/x/net v0.2.0 // indirect
74+
golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9 // indirect
75+
golang.org/x/mod v0.7.0 // indirect
76+
golang.org/x/net v0.5.0 // indirect
7977
golang.org/x/sync v0.1.0 // indirect
80-
golang.org/x/text v0.4.0 // indirect
81-
golang.org/x/tools v0.2.0 // indirect
82-
google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 // indirect
83-
google.golang.org/grpc v1.50.0 // indirect
78+
golang.org/x/text v0.6.0 // indirect
79+
golang.org/x/tools v0.5.0 // indirect
80+
google.golang.org/genproto v0.0.0-20230202175211-008b39050e57 // indirect
81+
google.golang.org/grpc v1.52.3 // indirect
8482
google.golang.org/protobuf v1.28.1 // indirect
8583
)
86-
87-
replace github.com/projecteru2/core => /Users/cmgs/.go/src/github/projecteru2/core

0 commit comments

Comments
 (0)