diff options
| author | zhangjie <iamkadisi@163.com> | 2020-02-04 16:13:11 +0800 |
|---|---|---|
| committer | zhangjie <iamkadisi@163.com> | 2020-02-06 16:21:28 +0800 |
| commit | 614816fc9c5787c1d2f72a8832691435586b3a3f (patch) | |
| tree | cf3544a150a9640f6d136f0a1fe2b0787d73af67 | |
| parent | Merge pull request #1440 from fisherxu/e2e-fail (diff) | |
| download | kubeedge-614816fc9c5787c1d2f72a8832691435586b3a3f.tar.gz | |
add edgesite dir
Signed-off-by: zhangjie <iamkadisi@163.com>
| -rw-r--r-- | build/edgesite/Dockerfile | 2 | ||||
| -rw-r--r-- | edgesite/Makefile | 10 | ||||
| -rw-r--r-- | edgesite/cmd/edgesite/app/options/options.go (renamed from edgesite/cmd/app/options/options.go) | 0 | ||||
| -rw-r--r-- | edgesite/cmd/edgesite/app/server.go (renamed from edgesite/cmd/app/server.go) | 2 | ||||
| -rw-r--r-- | edgesite/cmd/edgesite/edgesite.go (renamed from edgesite/cmd/edgesite.go) | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/build/edgesite/Dockerfile b/build/edgesite/Dockerfile index 98fa15b21..d4785481c 100644 --- a/build/edgesite/Dockerfile +++ b/build/edgesite/Dockerfile @@ -11,7 +11,7 @@ RUN apk --no-cache update && \ apk --no-cache upgrade && \ apk --no-cache add build-base linux-headers sqlite-dev && \ CGO_ENABLED=1 go build -v -o /usr/local/bin/edgesite -ldflags="-w -s -extldflags -static" \ -github.com/kubeedge/kubeedge/edgesite/cmd +github.com/kubeedge/kubeedge/edgesite/cmd/edgesite FROM ${RUN_FROM} diff --git a/edgesite/Makefile b/edgesite/Makefile index 0d4fd03ba..9af0ac376 100644 --- a/edgesite/Makefile +++ b/edgesite/Makefile @@ -2,7 +2,7 @@ GO_LDFLAGS=-ldflags '$(shell ../hack/lib/version.sh)' # make edge_site .PHONY: default edge_site edge_site: verify - go build ${GO_LDFLAGS} cmd/edgesite.go + go build ${GO_LDFLAGS} cmd/edgesite/edgesite.go .PHONY: verify verify: @@ -16,7 +16,7 @@ cross_build: verify export GOARM=6 \ export CGO_ENABLED=1 \ export CC=arm-linux-gnueabi-gcc; \ - go build cmd/edgesite.go + go build cmd/edgesite/edgesite.go .PHONY: armv7 armv7: verify @@ -25,7 +25,7 @@ armv7: verify export GOARM=7 \ export CGO_ENABLED=1 \ export CC=arm-linux-gnueabi-gcc; \ - go build cmd/edgesite.go + go build cmd/edgesite/edgesite.go .PHONY: armv8 armv8: verify @@ -33,11 +33,11 @@ armv8: verify export GOOS="linux" \ export CGO_ENABLED=1 \ export CC=aarch64-linux-gnu-gcc; \ - go build cmd/edgesite.go + go build cmd/edgesite/edgesite.go .PHONY: small_build small_build: verify - go build -ldflags="-w -s -extldflags -static" cmd/edgesite.go + go build -ldflags="-w -s -extldflags -static" cmd/edgesite/edgesite.go # There are options in upx-ucl like --best, which has best compression, # but also has a drawback of taking too long for big files, we are using -9 since it takes less time # Pls use --help for more information diff --git a/edgesite/cmd/app/options/options.go b/edgesite/cmd/edgesite/app/options/options.go index 3031d493e..3031d493e 100644 --- a/edgesite/cmd/app/options/options.go +++ b/edgesite/cmd/edgesite/app/options/options.go diff --git a/edgesite/cmd/app/server.go b/edgesite/cmd/edgesite/app/server.go index 6c106e5d3..122f79609 100644 --- a/edgesite/cmd/app/server.go +++ b/edgesite/cmd/edgesite/app/server.go @@ -16,7 +16,7 @@ import ( "github.com/kubeedge/kubeedge/edge/pkg/common/dbm" "github.com/kubeedge/kubeedge/edge/pkg/edged" "github.com/kubeedge/kubeedge/edge/pkg/metamanager" - "github.com/kubeedge/kubeedge/edgesite/cmd/app/options" + "github.com/kubeedge/kubeedge/edgesite/cmd/edgesite/app/options" "github.com/kubeedge/kubeedge/pkg/apis/edgesite/v1alpha1" "github.com/kubeedge/kubeedge/pkg/apis/edgesite/v1alpha1/validation" "github.com/kubeedge/kubeedge/pkg/util/flag" diff --git a/edgesite/cmd/edgesite.go b/edgesite/cmd/edgesite/edgesite.go index d5425796a..efd813277 100644 --- a/edgesite/cmd/edgesite.go +++ b/edgesite/cmd/edgesite/edgesite.go @@ -5,7 +5,7 @@ import ( "k8s.io/component-base/logs" - "github.com/kubeedge/kubeedge/edgesite/cmd/app" + "github.com/kubeedge/kubeedge/edgesite/cmd/edgesite/app" ) func main() { |