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

feat: support connect one namespace but proxy workload in another namespace (#496)

Browse Source
This commit is contained in:
naison
2025-03-30 11:50:11 +08:00
committed by GitHub
parent 08bcbe1611
commit a030dc582b
31 changed files with 545 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/handler/uninstall.go
View File

@@ -91,7 +91,7 @@ func (c *ConnectOptions) LeaveAllProxyResources(ctx context.Context) (err error)
v4, _ := c.GetLocalTunIP()
for _, workload := range c.ProxyResources() {
// deployments.apps.ry-server --> deployments.apps/ry-server
object, err := util.GetUnstructuredObject(c.factory, c.Namespace, workload)
object, err := util.GetUnstructuredObject(c.factory, workload.namespace, workload.workload)
if err != nil {
plog.G(ctx).Errorf("Failed to get unstructured object: %v", err)
return err
@@ -105,7 +105,7 @@ func (c *ConnectOptions) LeaveAllProxyResources(ctx context.Context) (err error)
var empty bool
empty, err = inject.UnPatchContainer(ctx, c.factory, c.clientset.CoreV1().ConfigMaps(c.Namespace), object, func(isFargateMode bool, rule *controlplane.Rule) bool {
if isFargateMode {
return c.IsMe(util.ConvertWorkloadToUid(workload), rule.Headers)
return c.IsMe(workload.namespace, util.ConvertWorkloadToUid(workload.workload), rule.Headers)
}
return rule.LocalTunIPv4 == v4
})
@@ -114,9 +114,9 @@ func (c *ConnectOptions) LeaveAllProxyResources(ctx context.Context) (err error)
continue
}
if empty {
err = inject.ModifyServiceTargetPort(ctx, c.clientset, c.Namespace, templateSpec.Labels, map[int32]int32{})
err = inject.ModifyServiceTargetPort(ctx, c.clientset, workload.namespace, templateSpec.Labels, map[int32]int32{})
}
c.LeavePortMap(workload)
c.LeavePortMap(workload.namespace, workload.workload)
}
return err
}