Support the multiple network when creating Pod #111

hwchiu · 2018-07-17T10:03:57Z

支援 Network 參數，可將該 Pod 與先前創立的 Network 綁定
參考該 Yaml
https://github.com/linkernetworks/network-controller/blob/master/deploy/client/clientpodtest.yaml

codecov-io · 2018-07-17T10:51:15Z

Codecov Report

Merging #111 into develop will increase coverage by 1.59%.
The diff coverage is 95.9%.

@@             Coverage Diff             @@
##           develop     #111      +/-   ##
===========================================
+ Coverage    72.77%   74.36%   +1.59%     
===========================================
  Files           35       37       +2     
  Lines         1620     1740     +120     
===========================================
+ Hits          1179     1294     +115     
- Misses         379      381       +2     
- Partials        62       65       +3

Impacted Files	Coverage Δ
src/utils/net.go	`100% <100%> (ø)`
src/utils/intersection.go	`86.66% <86.66%> (ø)`
src/pod/pod.go	`96.44% <97.08%> (+0.86%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9b7508a...26e3e82. Read the comment docs.

John-Lin · 2018-07-17T15:43:23Z

打開Linuc capability. NET ADMIN 可能要考慮進去

John-Lin · 2018-07-17T15:44:11Z

哦哦應該是要在create pod那邊，這裡不應該是做Linux capability

hwchiu · 2018-07-18T05:09:56Z

capability 開一個額外task來做，包含 vlan* 這個都額外開

John-Lin · 2018-07-18T07:02:13Z

src/entity/pod.go

@@ -16,6 +16,15 @@ type Container struct {
 	Command []string `bson:"command" json:"command" validate:"required,dive,required"`
 }

+type PodNetwork struct {
+	Name       string `bson:"name" json:"name"`
+	IFName     string `bson:"ifName" json:"ifName"`


John-Lin · 2018-07-18T07:04:10Z

src/entity/pod.go

+type PodNetwork struct {
+	Name       string `bson:"name" json:"name"`
+	IFName     string `bson:"ifName" json:"ifName"`
+	VLAN       int    `bson:"vlan" json:"vlan"`


vlanTag int32 `bson:"vlanTag" json:"vlanTag"`

John-Lin · 2018-07-18T07:06:44Z

src/pod/pod.go

+	for i, v := range networks {
+		containers = append(containers, corev1.Container{
+			Name:    fmt.Sprintf("init-network-client-%d", i),
+			Image:   "sdnvortex/network-controller:latest",


先固定在 v0.2.1?

John-Lin · 2018-07-18T07:08:38Z

src/pod/pod.go

+	return containers, nil
+}
+
+//For the network, we will generate two thins


John-Lin · 2018-07-18T07:14:04Z

src/pod/pod.go

+//For the network, we will generate two thins
+//[]string => a list of nodes and it will apply on nodeaffinity
+//[]corev1.Container => a list of init container we will apply on pod
+func generateNetwork(pod *entity.Pod, session *mongo.Session) ([]string, []corev1.Container, error) {


session *mongo.Session 可以放第一個嗎

John-Lin · 2018-07-18T07:17:36Z

src/pod/pod.go

+	return []string{
+		"-s=unix:///tmp/vortex.sock",
+		"-b=" + network.BridgeName,
+		"-n=" + network.IFName,


WakeupTsai · 2018-07-18T09:37:31Z

src/entity/pod.go

@@ -16,6 +16,15 @@ type Container struct {
 	Command []string `bson:"command" json:"command" validate:"required,dive,required"`
 }

+type PodNetwork struct {
+	Name       string `bson:"name" json:"name"`
+	IfName     string `bson:"ifName" json:"ifName"`


要不要改叫IfaceName?IfName有點看不懂

我覺得 IfName 因為linux有慣例也是取名IfName

WakeupTsai · 2018-07-18T09:38:54Z

src/pod/pod.go

+		if err != nil {
+			return fmt.Errorf("check the network name error:%v", err)
+		} else if count == 0 {
+			return fmt.Errorf("the network name %s doesn't exist", v.Name)


the network named %s doesn't exist

WakeupTsai · 2018-07-18T09:39:42Z

src/pod/pod.go

@@ -79,6 +91,123 @@ func generateVolume(pod *entity.Pod, session *mongo.Session) ([]corev1.Volume, [
 	return volumes, volumeMounts, nil
 }

+//Get the intersecion of nodes' name


Intersection

Support the multiple network when creating Pod Former-commit-id: d53e9023c5cabd4d27185cf9b2533826955ba221 [formerly aa080c1] Former-commit-id: 52cfd8f83d35e0521715b4fc534a8e0d866e51f7

Support the multiple network when creating Pod Former-commit-id: d53e9023c5cabd4d27185cf9b2533826955ba221 [formerly d53e9023c5cabd4d27185cf9b2533826955ba221 [formerly aa080c1]] Former-commit-id: 52cfd8f83d35e0521715b4fc534a8e0d866e51f7 Former-commit-id: 3b31489

Support the multiple network when creating Pod

hwchiu force-pushed the hwchiu/VX-169 branch from fff0560 to 33f6fb1 Compare July 17, 2018 10:42

hwchiu added 13 commits July 18, 2018 05:12

Add the function to get the intersection of arrays

34065f0

add the parameter check

a9d69a4

Add the function to get the intersection of node names

8f22b48

Modify the entity of Pod

80fdb01

Add the packet to transfrom the ip/network to CIDR form

a2ce9ed

Implement the function for basic init-container

2c30e1e

Add the env for build-in information

f46d87d

Add the Volume/VolumeMount for init-continaer

8f76e91

Add the testing for generate network

d18e645

Add the nodeaffinity

b8e4c08

Fix missing parameter and typo

588676c

Don't set the affinity if we don't address any network

4898db7

fix test

4ca8f17

hwchiu force-pushed the hwchiu/VX-169 branch from 05d00c0 to 4ca8f17 Compare July 18, 2018 05:19

hwchiu changed the title ~~[WIP]Support the multiple network when creating Pod~~ Support the multiple network when creating Pod Jul 18, 2018

hwchiu requested review from John-Lin and chenyunchen July 18, 2018 06:06

John-Lin reviewed Jul 18, 2018

View reviewed changes

src/pod/pod.go Outdated

return containers, nil

}

//For the network, we will generate two thins

Copy link

Contributor

John-Lin Jul 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

things

John-Lin reviewed Jul 18, 2018

View reviewed changes

John-Lin approved these changes Jul 18, 2018

View reviewed changes

chenyunchen approved these changes Jul 18, 2018

View reviewed changes

WakeupTsai reviewed Jul 18, 2018

View reviewed changes

Rename and fix typo

26e3e82

hwchiu force-pushed the hwchiu/VX-169 branch from 3b83dc2 to 26e3e82 Compare July 18, 2018 09:59

WakeupTsai approved these changes Jul 18, 2018

View reviewed changes

hwchiu merged commit aa080c1 into develop Jul 18, 2018

hwchiu deleted the hwchiu/VX-169 branch July 18, 2018 10:15

John-Lin pushed a commit that referenced this pull request Jul 25, 2018

Merge pull request #111 from linkernetworks/hwchiu/VX-169

9fa93d4

Support the multiple network when creating Pod

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support the multiple network when creating Pod #111

Support the multiple network when creating Pod #111

hwchiu commented Jul 17, 2018

codecov-io commented Jul 17, 2018 •

edited

Loading

John-Lin commented Jul 17, 2018

John-Lin commented Jul 17, 2018

hwchiu commented Jul 18, 2018

John-Lin Jul 18, 2018

John-Lin Jul 18, 2018 •

edited

Loading

John-Lin Jul 18, 2018

John-Lin Jul 18, 2018

John-Lin Jul 18, 2018

John-Lin Jul 18, 2018

WakeupTsai Jul 18, 2018

John-Lin Jul 18, 2018

WakeupTsai Jul 18, 2018

WakeupTsai Jul 18, 2018 •

edited

Loading

Support the multiple network when creating Pod #111

Support the multiple network when creating Pod #111

Conversation

hwchiu commented Jul 17, 2018

codecov-io commented Jul 17, 2018 • edited Loading

Codecov Report

John-Lin commented Jul 17, 2018

John-Lin commented Jul 17, 2018

hwchiu commented Jul 18, 2018

Choose a reason for hiding this comment

John-Lin Jul 18, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

WakeupTsai Jul 18, 2018 • edited Loading

Choose a reason for hiding this comment

codecov-io commented Jul 17, 2018 •

edited

Loading

John-Lin Jul 18, 2018 •

edited

Loading

WakeupTsai Jul 18, 2018 •

edited

Loading