opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 22:53:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow containerPortsToServicePorts to fail

Browse Source 
Add an error return to it and affected callers.

Should not affect behavior, the function can't currently fail.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2021-11-19 09:58:26 +01:00
parent ec686d68dd
commit a948ecbb9c
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libpod/kube.go
View File

@ -80,7 +80,10 @@ func (p *Pod) GenerateForKube(ctx context.Context) (*v1.Pod, []v1.ServicePort, e
return nil, servicePorts, err return nil, servicePorts, err
} }
spState := newServicePortState() spState := newServicePortState()
servicePorts = spState.containerPortsToServicePorts(ports) servicePorts, err = spState.containerPortsToServicePorts(ports)
if err != nil {
return nil, servicePorts, err
}
hostNetwork = infraContainer.NetworkMode() == string(namespaces.NetworkMode(specgen.Host)) hostNetwork = infraContainer.NetworkMode() == string(namespaces.NetworkMode(specgen.Host))
} }
pod, err := p.podWithContainers(ctx, allContainers, ports, hostNetwork) pod, err := p.podWithContainers(ctx, allContainers, ports, hostNetwork)
@ -243,13 +246,17 @@ func ConvertV1PodToYAMLPod(pod *v1.Pod) *YAMLPod {
} }
// GenerateKubeServiceFromV1Pod creates a v1 service object from a v1 pod object // GenerateKubeServiceFromV1Pod creates a v1 service object from a v1 pod object
func GenerateKubeServiceFromV1Pod(pod *v1.Pod, servicePorts []v1.ServicePort) YAMLService { func GenerateKubeServiceFromV1Pod(pod *v1.Pod, servicePorts []v1.ServicePort) (YAMLService, error) {
service := YAMLService{} service := YAMLService{}
selector := make(map[string]string) selector := make(map[string]string)
selector["app"] = pod.Labels["app"] selector["app"] = pod.Labels["app"]
ports := servicePorts ports := servicePorts
if len(ports) == 0 { if len(ports) == 0 {
ports = containersToServicePorts(pod.Spec.Containers) p, err := containersToServicePorts(pod.Spec.Containers)
if err != nil {
return service, err
}
ports = p
} }
serviceSpec := v1.ServiceSpec{ serviceSpec := v1.ServiceSpec{
Ports: ports, Ports: ports,
@ -263,7 +270,7 @@ func GenerateKubeServiceFromV1Pod(pod *v1.Pod, servicePorts []v1.ServicePort) YA
APIVersion: pod.TypeMeta.APIVersion, APIVersion: pod.TypeMeta.APIVersion,
} }
service.TypeMeta = tm service.TypeMeta = tm
return service return service, nil
} }
// servicePortState allows calling containerPortsToServicePorts for a single service // servicePortState allows calling containerPortsToServicePorts for a single service
@ -281,7 +288,7 @@ func newServicePortState() servicePortState {
// containerPortsToServicePorts takes a slice of containerports and generates a // containerPortsToServicePorts takes a slice of containerports and generates a
// slice of service ports // slice of service ports
func (state *servicePortState) containerPortsToServicePorts(containerPorts []v1.ContainerPort) []v1.ServicePort { func (state *servicePortState) containerPortsToServicePorts(containerPorts []v1.ContainerPort) ([]v1.ServicePort, error) {
sps := make([]v1.ServicePort, 0, len(containerPorts)) sps := make([]v1.ServicePort, 0, len(containerPorts))
for _, cp := range containerPorts { for _, cp := range containerPorts {
// Legal nodeport range is 30000-32767 // Legal nodeport range is 30000-32767
@ -295,18 +302,22 @@ func (state *servicePortState) containerPortsToServicePorts(containerPorts []v1.
} }
sps = append(sps, servicePort) sps = append(sps, servicePort)
} }
return sps return sps, nil
} }
// containersToServicePorts takes a slice of v1.Containers and generates an // containersToServicePorts takes a slice of v1.Containers and generates an
// inclusive list of serviceports to expose // inclusive list of serviceports to expose
func containersToServicePorts(containers []v1.Container) []v1.ServicePort { func containersToServicePorts(containers []v1.Container) ([]v1.ServicePort, error) {
state := newServicePortState() state := newServicePortState()
sps := make([]v1.ServicePort, 0, len(containers)) sps := make([]v1.ServicePort, 0, len(containers))
for _, ctr := range containers { for _, ctr := range containers {
sps = append(sps, state.containerPortsToServicePorts(ctr.Ports)...) ports, err := state.containerPortsToServicePorts(ctr.Ports)
if err != nil {
return nil, err
}
sps = append(sps, ports...)
} }
return sps return sps, nil
} }
func (p *Pod) podWithContainers(ctx context.Context, containers []*Container, ports []v1.ContainerPort, hostNetwork bool) (*v1.Pod, error) { func (p *Pod) podWithContainers(ctx context.Context, containers []*Container, ports []v1.ContainerPort, hostNetwork bool) (*v1.Pod, error) {

12
pkg/domain/infra/abi/generate.go
View File

@ -139,7 +139,11 @@ func (ic *ContainerEngine) GenerateKube(ctx context.Context, nameOrIDs []string,
podContent = append(podContent, b) podContent = append(podContent, b)
if options.Service { if options.Service {
b, err := generateKubeYAML(libpod.GenerateKubeServiceFromV1Pod(po, []k8sAPI.ServicePort{})) svc, err := libpod.GenerateKubeServiceFromV1Pod(po, []k8sAPI.ServicePort{})
if err != nil {
return nil, err
}
b, err := generateKubeYAML(svc)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -177,7 +181,11 @@ func getKubePods(ctx context.Context, pods []*libpod.Pod, getService bool) ([][]
pos = append(pos, b) pos = append(pos, b)
if getService { if getService {
b, err := generateKubeYAML(libpod.GenerateKubeServiceFromV1Pod(po, sp)) svc, err := libpod.GenerateKubeServiceFromV1Pod(po, sp)
if err != nil {
return nil, nil, err
}
b, err := generateKubeYAML(svc)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }