apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-10-06 07:47:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add extra node ip to route table (#179)

Browse Source 
* feat: add extra node ip to route table
This commit is contained in:
naison
2024-02-27 18:00:52 +08:00
committed by GitHub
parent 7c560df82b
commit a8826b3334
13 changed files with 622 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkg/dev/main.go
View File

@@ -60,16 +60,15 @@ const (
)
type Options struct {
Headers map[string]string
Namespace string
Workload string
Factory cmdutil.Factory
ContainerName string
NoProxy bool
ExtraCIDR []string
ExtraDomain []string
ConnectMode ConnectMode
Engine config.Engine
Headers map[string]string
Namespace string
Workload string
Factory cmdutil.Factory
ContainerName string
NoProxy bool
ExtraRouteInfo handler.ExtraRouteInfo
ConnectMode ConnectMode
Engine config.Engine
// docker options
DockerImage string
@@ -461,8 +460,7 @@ func (d *Options) doConnect(ctx context.Context, f cmdutil.Factory, conf *util.S
connect := &handler.ConnectOptions{
Headers: d.Headers,
Workloads: []string{d.Workload},
ExtraCIDR: d.ExtraCIDR,
ExtraDomain: d.ExtraDomain,
ExtraRouteInfo: d.ExtraRouteInfo,
Engine: d.Engine,
OriginKubeconfigPath: util.GetKubeconfigPath(f),
}
@@ -513,8 +511,7 @@ func (d *Options) doConnect(ctx context.Context, f cmdutil.Factory, conf *util.S
Namespace: ns,
Headers: connect.Headers,
Workloads: connect.Workloads,
ExtraCIDR: connect.ExtraCIDR,
ExtraDomain: connect.ExtraDomain,
ExtraRoute: connect.ExtraRouteInfo.ToRPC(),
UseLocalDNS: connect.UseLocalDNS,
Engine: string(connect.Engine),
OriginKubeconfigPath: util.GetKubeconfigPath(f),
@@ -627,23 +624,29 @@ func createConnectContainer(noProxy bool, connect handler.ConnectOptions, path s
var entrypoint []string
if noProxy {
entrypoint = []string{"kubevpn", "connect", "--foreground", "-n", connect.Namespace, "--kubeconfig", "/root/.kube/config", "--image", config.Image, "--engine", string(connect.Engine)}
for _, v := range connect.ExtraCIDR {
for _, v := range connect.ExtraRouteInfo.ExtraCIDR {
entrypoint = append(entrypoint, "--extra-cidr", v)
}
for _, v := range connect.ExtraDomain {
for _, v := range connect.ExtraRouteInfo.ExtraDomain {
entrypoint = append(entrypoint, "--extra-domain", v)
}
if connect.ExtraRouteInfo.ExtraNodeIP {
entrypoint = append(entrypoint, "--extra-node-ip")
}
} else {
entrypoint = []string{"kubevpn", "proxy", connect.Workloads[0], "--foreground", "-n", connect.Namespace, "--kubeconfig", "/root/.kube/config", "--image", config.Image, "--engine", string(connect.Engine)}
for k, v := range connect.Headers {
entrypoint = append(entrypoint, "--headers", fmt.Sprintf("%s=%s", k, v))
}
for _, v := range connect.ExtraCIDR {
for _, v := range connect.ExtraRouteInfo.ExtraCIDR {
entrypoint = append(entrypoint, "--extra-cidr", v)
}
for _, v := range connect.ExtraDomain {
for _, v := range connect.ExtraRouteInfo.ExtraDomain {
entrypoint = append(entrypoint, "--extra-domain", v)
}
if connect.ExtraRouteInfo.ExtraNodeIP {
entrypoint = append(entrypoint, "--extra-node-ip")
}
}
runConfig := &container.Config{