opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(host): add enable_container_cni_portmap option (#21202)

Browse Source
This commit is contained in:
Zexi Li
2024-09-12 10:05:38 +08:00
committed by GitHub
parent 6c14dbadb7
commit 0bd46675ef
2 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/pod.go
+25 -23
View File
@@ -701,30 +701,32 @@ func (s *sPodGuestInstance) _startPod(ctx context.Context, userCred mcclient.Tok
}
}
/*metaPms, err := s.GetPortMappings()
if err != nil {
return nil, errors.Wrap(err, "GetPortMappings")
}
if len(metaPms) != 0 {
pms := make([]*runtimeapi.PortMapping, len(metaPms))
for idx := range metaPms {
pm := metaPms[idx]
proto := runtimeapi.Protocol_TCP
switch pm.Protocol {
case computeapi.PodPortMappingProtocolTCP:
proto = runtimeapi.Protocol_TCP
case computeapi.PodPortMappingProtocolUDP:
proto = runtimeapi.Protocol_UDP
}
pms[idx] = &runtimeapi.PortMapping{
Protocol: proto,
ContainerPort: pm.ContainerPort,
HostPort: pm.HostPort,
HostIp: pm.HostIp,
}
if options.HostOptions.EnableContainerCniPortmap {
metaPms, err := s.GetPortMappings()
if err != nil {
return nil, errors.Wrap(err, "GetPortMappings")
}
podCfg.PortMappings = pms
}*/
if len(metaPms) != 0 {
pms := make([]*runtimeapi.PortMapping, len(metaPms))
for idx := range metaPms {
pm := metaPms[idx]
proto := runtimeapi.Protocol_TCP
switch pm.Protocol {
case computeapi.PodPortMappingProtocolTCP:
proto = runtimeapi.Protocol_TCP
case computeapi.PodPortMappingProtocolUDP:
proto = runtimeapi.Protocol_UDP
}
pms[idx] = &runtimeapi.PortMapping{
Protocol: proto,
ContainerPort: int32(pm.Port),
HostPort: int32(*pm.HostPort),
HostIp: pm.HostIp,
}
}
podCfg.PortMappings = pms
}
}
criId, err := s.getCRI().RunPod(ctx, podCfg, "")
if err != nil {
pkg/hostman/options/options.go
+2 -1
View File
@@ -228,7 +228,8 @@ type SHostOptions struct {
EnableContainerAscendNPU bool `help:"enable container npu" default:"false"`
EnableDirtyRecoverySeconds int `help:"Seconds to delay enable dirty guests recovery feature, default 15 minutes" default:"900"`
EnableDirtyRecoverySeconds int `help:"Seconds to delay enable dirty guests recovery feature, default 15 minutes" default:"900"`
EnableContainerCniPortmap bool `help:"Use container cni portmap plugin" default:"false"`
}
func (o SHostOptions) HostLocalNetconfPath(br string) string {