EdgeSite working with standard K8s master #400

CindyXing · 2019-04-22T23:55:40Z

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind test
/kind failing-test

/kind feature

What this PR does / why we need it:
This change enables KubeEdge agent talking to a K8s master such as K3S server.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

m1093782566 · 2019-04-23T01:23:39Z

A quick question, should not we treat edgesite as an independent project?

CindyXing · 2019-04-23T16:42:40Z

A quick question, should not we treat edgesite as an independent project?

I'd like to make sure we brand the edgesite as part of KubeEdge project. Also edgesite mainly is to build a new client side.

rohitsardesai83 · 2019-04-24T13:32:02Z

@CindyXing , the idea of edge site is good . Is there some way we can avoid code duplication ?

sids-b · 2019-04-24T13:50:10Z

@CindyXing , the idea of edge site is good . Is there some way we can avoid code duplication ?

+1 to @rohitsardesai83 . All our settings are configuration based. I feel having a edgesite.go , conf and few changes in edge modules should do the work. I can help with it :)

sids-b · 2019-04-24T13:52:25Z

vendor/github.com/kubeedge/beehive/pkg/common/util/parse_resource.go

@@ -13,6 +13,8 @@ func ParseResourceEdge(resource string, operation string) (string, string, strin
 	resourceSplits := strings.Split(resource, "/")
 	if len(resourceSplits) == 3 {
 		return resourceSplits[0], resourceSplits[1], resourceSplits[2], nil
+	} else if len(resourceSplits) == 5 {


We need to change in https://github.com/kubeedge/beehive and then update the vendor.

sids-b · 2019-04-24T13:53:39Z

A quick question, should not we treat edgesite as an independent project?

I'd like to make sure we brand the edgesite as part of KubeEdge project. Also edgesite mainly is to build a new client side.

Agree, kubeedge should be able to support EdgeSite scenarios as well.

CindyXing · 2019-04-24T19:39:39Z

@CindyXing , the idea of edge site is good . Is there some way we can avoid code duplication ?

+1 to @rohitsardesai83 . All our settings are configuration based. I feel having a edgesite.go , conf and few changes in edge modules should do the work. I can help with it :)

Yes, agree that we should prevent dup code. That's why most of the code is referenced from edge folder. Currently there is some change in the controller/manager that it'll only watch pods bond to the current node. There can be other change(s) needed. So, for now, let's keep separate and then adjust accordingly.

CindyXing

That's why we should use protobuf for the message type and not hardcode the index and length.

sids-b · 2019-05-13T06:23:07Z

The design doc mentions about lightweight etcd, where does that fit here ? Or will we be using sqlite ?

CindyXing · 2019-05-13T17:00:28Z

The design doc mentions about lightweight etcd, where does that fit here ? Or will we be using sqlite ?
lightweight etcd is for the control plane not agent.

The design doc mentions about lightweight etcd, where does that fit here ? Or will we be using sqlite ?

What do you mean @sids-b? Either sqlite or lightweight etcd. A lightweight etcd can be used when it is available. And it is customer's choice.

sids-b · 2019-05-13T17:07:18Z

Ohh, I get it now, so metaManager uses either sqlite or ligtweight etcd based on configurations of customer. Sounds good :)

kevin-wangzefeng

Minor comments, thanks.

edgesite/pkg/controller/constants/service.go

edgesite/pkg/controller/config/kube.go

kevin-wangzefeng · 2019-05-14T02:12:08Z

edgesite/pkg/controller/constants/service.go

+	ResourceSliceLength       = 5
+	ResourceSliceLengthQuery  = 4
+	ResourceNodeIndex         = 0
+        ResourceNodeIDIndex       = 1


inaccurate indent

kevin-wangzefeng · 2019-05-14T02:21:39Z

edgesite/pkg/controller/controller/upstream.go

+				}
+
+				// In case the status stored at metadata service is outdated, update the heartbeat automatically
+				/*for i := range nodeStatusRequest.Status.Conditions {


Why it is period commented?
If it's intended, please describe when to uncomment this.

edgesite/pkg/controller/config/kube.go

sids-b · 2019-05-15T15:31:26Z

@kevin-wangzefeng @qizha @m1093782566 . The PR is ready for review

rohitsardesai83

lgtm

rohitsardesai83 · 2019-05-17T04:47:10Z

Let's address the issue #531 post merging this. Thanks.

sids-b

LGTM

sids-b · 2019-05-17T06:45:49Z

/lgtm

m1093782566 · 2019-05-17T06:47:58Z

/lgtm

kevin-wangzefeng · 2019-05-17T07:28:55Z

edgesite/conf/edgeSite.yaml

+metamanager:
+    context-send-group: controller
+    context-send-module: controller
+    edgesite: true


No new line at end of file

kevin-wangzefeng

LGTM.
One none blocking issue is that we need version control for the component configs, which makes life easier for upgrades etc.. Let's clean it up in #525

sids-b · 2019-05-17T07:48:13Z

LGTM.
One none blocking issue is that we need version control for the component configs, which makes life easier for upgrades etc.. Let's clean it up in #525

Sure, Thanks

EdgeSite working with standard K8s master

CindyXing requested review from qizha, kevin-wangzefeng, Baoqiang-Zhang and sids-b April 22, 2019 23:55

kubeedge-bot added the kind/feature Categorizes issue or PR as related to a new feature. label Apr 22, 2019

sids-b force-pushed the cindy-edgesite branch from 62947e7 to f9a6caf Compare April 24, 2019 09:49

sids-b reviewed Apr 24, 2019

View reviewed changes

CindyXing commented Apr 24, 2019

View reviewed changes

m1093782566 added this to the Backlog milestone Apr 26, 2019

qizha changed the title ~~[WIP] EdgeSite working with K8s master or K3S server~~ [WIP] EdgeSite working with standard K8s master May 10, 2019

qizha previously approved these changes May 10, 2019

View reviewed changes

kevin-wangzefeng reviewed May 14, 2019

View reviewed changes

sids-b modified the milestones: Backlog, v1.0.0 May 14, 2019

CindyXing dismissed qizha’s stale review via c00d700 May 14, 2019 23:33

Cindy Xing and others added 6 commits May 15, 2019 10:15

[WIP] EdgeSite working with K8s master or K3S server

356ba4f

Fix existing test failure

adc9f6a

Fix gofmt

fe088c1

fixed metamanager UT

e56f1a1

made case 2,4 and 3,5 similar

9ac6ecb

added docker-address in edged

3adb52e

sids-b and others added 4 commits May 15, 2019 10:15

fixed the vendor change + metamanager UT revert

013bf0b

Fix upon Kevin's code review comments

a8f3892

Fix build

8c97933

fixed secret and configmap deployment

f6cd18c

sids-b force-pushed the cindy-edgesite branch from c00d700 to f6cd18c Compare May 15, 2019 09:35

sids-b changed the title ~~[WIP] EdgeSite working with standard K8s master~~ EdgeSite working with standard K8s master May 15, 2019

rohitsardesai83 approved these changes May 17, 2019

View reviewed changes

sids-b approved these changes May 17, 2019

View reviewed changes

kubeedge-bot added the lgtm Indicates that a PR is ready to be merged. label May 17, 2019

kevin-wangzefeng reviewed May 17, 2019

View reviewed changes

kevin-wangzefeng approved these changes May 17, 2019

View reviewed changes

kevin-wangzefeng merged commit dc7c75f into master May 17, 2019

sids-b deleted the cindy-edgesite branch May 19, 2019 10:51

lidiyag pushed a commit to lidiyag/kubeedge that referenced this pull request Jun 19, 2019

EdgeSite working with standard K8s master (kubeedge#400)

6a68439

EdgeSite working with standard K8s master

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EdgeSite working with standard K8s master #400

EdgeSite working with standard K8s master #400

CindyXing commented Apr 22, 2019 •

edited

m1093782566 commented Apr 23, 2019

CindyXing commented Apr 23, 2019

rohitsardesai83 commented Apr 24, 2019

sids-b commented Apr 24, 2019 •

edited

sids-b Apr 24, 2019

sids-b commented Apr 24, 2019

CindyXing commented Apr 24, 2019

CindyXing left a comment

sids-b commented May 13, 2019

CindyXing commented May 13, 2019

sids-b commented May 13, 2019

kevin-wangzefeng left a comment

kevin-wangzefeng May 14, 2019

kevin-wangzefeng May 14, 2019

sids-b commented May 15, 2019

rohitsardesai83 left a comment

rohitsardesai83 commented May 17, 2019

sids-b left a comment

sids-b commented May 17, 2019

m1093782566 commented May 17, 2019

kevin-wangzefeng May 17, 2019

kevin-wangzefeng left a comment

sids-b commented May 17, 2019

EdgeSite working with standard K8s master #400

EdgeSite working with standard K8s master #400

Conversation

CindyXing commented Apr 22, 2019 • edited

m1093782566 commented Apr 23, 2019

CindyXing commented Apr 23, 2019

rohitsardesai83 commented Apr 24, 2019

sids-b commented Apr 24, 2019 • edited

sids-b Apr 24, 2019

Choose a reason for hiding this comment

sids-b commented Apr 24, 2019

CindyXing commented Apr 24, 2019

CindyXing left a comment

Choose a reason for hiding this comment

sids-b commented May 13, 2019

CindyXing commented May 13, 2019

sids-b commented May 13, 2019

kevin-wangzefeng left a comment

Choose a reason for hiding this comment

kevin-wangzefeng May 14, 2019

Choose a reason for hiding this comment

kevin-wangzefeng May 14, 2019

Choose a reason for hiding this comment

sids-b commented May 15, 2019

rohitsardesai83 left a comment

Choose a reason for hiding this comment

rohitsardesai83 commented May 17, 2019

sids-b left a comment

Choose a reason for hiding this comment

sids-b commented May 17, 2019

m1093782566 commented May 17, 2019

kevin-wangzefeng May 17, 2019

Choose a reason for hiding this comment

kevin-wangzefeng left a comment

Choose a reason for hiding this comment

sids-b commented May 17, 2019

CindyXing commented Apr 22, 2019 •

edited

sids-b commented Apr 24, 2019 •

edited