Skip to content

Commit 60e5b4c

Browse files
shjalashjala
committed
NeoEden : move things around
1- move eden, escript, eserver, processing, sdn to pkg folder 2- move workflow out of tests folder 3- change eden go mod to point to the new location 4- update the eden packages go files to point to the new location Signed-off-by: Shahriyar Jalayeri <[email protected]>
1 parent 0b95a36 commit 60e5b4c

File tree

419 files changed

+915
-851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

419 files changed

+915
-851
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ LINUXKIT_TARGET ?= build
1010
# ESERVER_TAG is the tag for eserver image to build
1111
ESERVER_TAG ?= "lfedge/eden-http-server"
1212
# ESERVER_DIR is the directory with eserver Dockerfile to build
13-
ESERVER_DIR=$(CURDIR)/eserver
13+
ESERVER_DIR=$(CURDIR)/pkg/eserver
1414
# ESERVER_VERSION is the version of eserver image to build
1515
ESERVER_VERSION ?= $(shell git rev-parse --short HEAD:eserver)
1616

1717
# PROCESSING_TAG is the tag for processing image to build
1818
PROCESSING_TAG ?= "lfedge/eden-processing"
1919
# PROCESSING_DIR is the directory with processing Dockerfile to build
20-
PROCESSING_DIR=$(CURDIR)/processing
20+
PROCESSING_DIR=$(CURDIR)/pkg/processing
2121
# PROCESSING_VERSION is the version of processing image to build
2222
PROCESSING_VERSION ?= $(shell git tag -l --contains HEAD)
2323
ifeq ($(PROCESSING_VERSION),)
@@ -34,7 +34,7 @@ ifeq ($(EDEN_VERSION),)
3434
endif
3535

3636
# SDN_DIR is the directory with eden-sdn Dockerfile to build
37-
SDN_DIR=$(CURDIR)/sdn/vm
37+
SDN_DIR=$(CURDIR)/pkg/sdn/vm
3838

3939
# HOSTARCH is the host architecture
4040
# ARCH is the target architecture
@@ -104,8 +104,8 @@ install: build
104104
CGO_ENABLED=0 go install .
105105

106106
build: $(BIN) $(EMPTY_DRIVE).raw $(EMPTY_DRIVE).qcow2 $(EMPTY_DRIVE).qcow $(EMPTY_DRIVE).vmdk $(EMPTY_DRIVE).vhdx $(LINUXKIT)
107-
$(LOCALBIN): $(BINDIR) cmd/*.go pkg/*/*.go pkg/*/*/*.go
108-
CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -ldflags "-s -w" -o $@ .
107+
$(LOCALBIN): $(BINDIR) pkg/eden/*.go
108+
CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) go build -ldflags "-s -w" -o $@ pkg/eden/*.go
109109
mkdir -p dist/scripts/shell
110110
cp -r shell-scripts/* dist/scripts/shell/
111111

‎NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Eden
2-
Copyright 2017-2019 Zededa Inc.
2+
Copyright 2017-2024 Zededa Inc.
33

44
Linuxkit
55
Copyright 2015-2017 Docker, Inc.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ The manager hosts:
9191
Eden currently does not support interfacing with a commercial controller,
9292
although it is planned for the future.
9393

94-
![Components](/eden_eve_components.png)
94+
![Components](docs/pics/eden_eve_components.png)
9595

9696
As the manager hosts the controller, which the edge device must connect to,
9797
the edge device _must_ be able to connect via network to port 3333.
9898

99-
![Architecture](/Eden_eve_architecture.png)
99+
![Architecture](docs/pics/Eden_eve_architecture.png)
100100

101101
For the edge device, you need an [EVE](https://github.com/lf-edge/eve) OS image
102102
to install.

‎Eden_eve_architecture.png‎ renamed to ‎docs/pics/Eden_eve_architecture.png‎

File renamed without changes.

‎eden_eve_components.png‎ renamed to ‎docs/pics/eden_eve_components.png‎

File renamed without changes.

‎go.mod‎

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎go.work‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
go 1.22.5
2+
3+
use ./pkg/eden

‎go.work.sum‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
cloud.google.com/go v0.115.1 h1:Jo0SM9cQnSkYfp44+v+NQXHpcHqlnRJk2qxh6yvxxxQ=
2+
cloud.google.com/go/compute v1.28.0 h1:OPtBxMcheSS+DWfci803qvPly3d4w7Eu5ztKBcFfzwk=
3+
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
4+
github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY=
5+
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=

‎cmd/adam.go‎ renamed to ‎pkg/eden/cmd/adam.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/lf-edge/eden/pkg/defaults"
8-
"github.com/lf-edge/eden/pkg/eden"
9-
"github.com/lf-edge/eden/pkg/openevec"
7+
"github.com/lf-edge/eden/pkg/eden/defaults"
8+
"github.com/lf-edge/eden/pkg/eden/eden"
9+
"github.com/lf-edge/eden/pkg/eden/openevec"
1010
log "github.com/sirupsen/logrus"
1111
"github.com/spf13/cobra"
1212
)

‎cmd/certs.go‎ renamed to ‎pkg/eden/cmd/certs.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"os"
55
"path/filepath"
66

7-
"github.com/lf-edge/eden/pkg/defaults"
8-
"github.com/lf-edge/eden/pkg/eden"
9-
"github.com/lf-edge/eden/pkg/openevec"
10-
"github.com/lf-edge/eden/pkg/utils"
7+
"github.com/lf-edge/eden/pkg/eden/defaults"
8+
"github.com/lf-edge/eden/pkg/eden/eden"
9+
"github.com/lf-edge/eden/pkg/eden/openevec"
10+
"github.com/lf-edge/eden/pkg/eden/utils"
1111
log "github.com/sirupsen/logrus"
1212
"github.com/spf13/cobra"
1313
)

0 commit comments

Comments
 (0)