Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Edgeview App needs latest pillar vendor files #3536

Merged
merged 2 commits into from
Oct 28, 2023
Merged

Edgeview App needs latest pillar vendor files #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10143b0
edgeview app commands needs latest pillar underlay name change
naiming-zededa Oct 26, 2023
a0c645b
generated files for edgeview app commands needs latest pillar underla…
naiming-zededa Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/edgeview/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.20
require (
github.com/gorilla/websocket v1.4.2
github.com/grandcat/zeroconf v1.0.0
github.com/lf-edge/eve-api/go v0.0.0-20230727134029-123abaf9479d
github.com/lf-edge/eve/pkg/pillar v0.0.0-20230727061425-295cf5137a5c
github.com/lf-edge/eve-api/go v0.0.0-20231011200019-cb3cb1275e0d
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231025120317-b25d016a16bb
github.com/satori/go.uuid v1.2.1-0.20180404165556-75cca531ea76
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/sirupsen/logrus v1.9.0
Expand Down
6 changes: 6 additions & 0 deletions pkg/edgeview/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lf-edge/eve-api/go v0.0.0-20230727134029-123abaf9479d h1:faYpmFF68poaWd6x7jeus1fR0RSeT1FbecIaZlv6rvQ=
github.com/lf-edge/eve-api/go v0.0.0-20230727134029-123abaf9479d/go.mod h1:6XqpOM8p1HsluNIGw2ihYPYsaAisQ5CuJpbIKHXQo5w=
github.com/lf-edge/eve-api/go v0.0.0-20231011200019-cb3cb1275e0d h1:PVKqYtPsH5BAIYfOaKej/+lc7+GKcFZBGnzbS6JWbrE=
github.com/lf-edge/eve-api/go v0.0.0-20231011200019-cb3cb1275e0d/go.mod h1:6XqpOM8p1HsluNIGw2ihYPYsaAisQ5CuJpbIKHXQo5w=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20230727061425-295cf5137a5c h1:zTBHaGVLcIUNV0dh9NzEtkYOMzYtZaumvMptFZRrxiU=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20230727061425-295cf5137a5c/go.mod h1:+FNnWXal1oxTF8xkhjyVIcSzvpXNCe2+7LXwMrNQP2E=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231016212340-616d6ea705a2 h1:oc1TSQe1Ke5st2HUZHWs4p8sS18g11yQlNSvxFPRgWA=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231016212340-616d6ea705a2/go.mod h1:YuUrK7yQdrSGH3D7auTDYNRgcBGBKGzbcVL5mY4IzrY=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231025120317-b25d016a16bb h1:pbvujlQLA66epNvCGgf4eRSdUTKvYPwU7fzOAltP/9o=
github.com/lf-edge/eve/pkg/pillar v0.0.0-20231025120317-b25d016a16bb/go.mod h1:YuUrK7yQdrSGH3D7auTDYNRgcBGBKGzbcVL5mY4IzrY=
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
Expand Down
3 changes: 3 additions & 0 deletions pkg/edgeview/src/basics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ func getAddrFromJWT(token string, isServer bool, instID int) (string, string, er
if runOnServer {
return addrport, path, fmt.Errorf("Edgeview is not in multi-instance mode, no need to specify inst-ID")
} else {
if instID > 1 {
return addrport, path, fmt.Errorf("Maximum instance is 1, can not use inst %d", instID)
}
fmt.Printf("%s\n", getColorStr("Edgeview is not in multi-instance mode, instance ignored here", colorCYAN))
edgeviewInstID = 0
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/edgeview/src/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func doAppNet(status, appstr string, isSummary bool) string {
_ = json.Unmarshal(retbytes, &deviceNetStatus)
}

for _, item := range appStatus.UnderlayNetworkList {
for _, item := range appStatus.AppNetAdapterList {
niUUID := item.Network.String()
// Try to obtain network instance status data.
var niStatus types.NetworkInstanceStatus
Expand Down Expand Up @@ -526,7 +526,7 @@ func getAppIPs(status string) ([]string, uuid.UUID) {
_ = json.Unmarshal([]byte(status), &appStatus)
var appIPs []string
appUUID := appStatus.UUIDandVersion.UUID
for _, item := range appStatus.UnderlayNetworkList {
for _, item := range appStatus.AppNetAdapterList {
if item.AllocatedIPv4Addr != nil {
appIPs = append(appIPs, item.AllocatedIPv4Addr.String())
}
Expand Down
111 changes: 74 additions & 37 deletions pkg/edgeview/vendor/github.com/lf-edge/eve-api/go/auth/auth.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/edgeview/vendor/github.com/lf-edge/eve-api/go/certs/certs.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading