github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Svc REST: Make update/releaseNodePorts methods

Browse Source 
More consistent overall.
This commit is contained in:
Tim Hockin 2021-08-24 23:20:09 -07:00
parent 4c9bc5a53c
commit d7c8557281
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/registry/core/service/storage/alloc.go
View File

@ -746,12 +746,12 @@ func (al *RESTAllocStuff) txnUpdateNodePorts(service, oldService *api.Service, d
// Update service from NodePort or LoadBalancer to ExternalName or ClusterIP, should release NodePort if exists. // Update service from NodePort or LoadBalancer to ExternalName or ClusterIP, should release NodePort if exists.
if (oldService.Spec.Type == api.ServiceTypeNodePort || oldService.Spec.Type == api.ServiceTypeLoadBalancer) && if (oldService.Spec.Type == api.ServiceTypeNodePort || oldService.Spec.Type == api.ServiceTypeLoadBalancer) &&
(service.Spec.Type == api.ServiceTypeExternalName || service.Spec.Type == api.ServiceTypeClusterIP) { (service.Spec.Type == api.ServiceTypeExternalName || service.Spec.Type == api.ServiceTypeClusterIP) {
releaseNodePorts(oldService, nodePortOp) al.releaseNodePorts(oldService, nodePortOp)
} }
// Update service from any type to NodePort or LoadBalancer, should update NodePort. // Update service from any type to NodePort or LoadBalancer, should update NodePort.
if service.Spec.Type == api.ServiceTypeNodePort || service.Spec.Type == api.ServiceTypeLoadBalancer { if service.Spec.Type == api.ServiceTypeNodePort || service.Spec.Type == api.ServiceTypeLoadBalancer {
if err := updateNodePorts(oldService, service, nodePortOp); err != nil { if err := al.updateNodePorts(oldService, service, nodePortOp); err != nil {
txn.Revert() txn.Revert()
return nil, err return nil, err
} }
@ -767,7 +767,7 @@ func (al *RESTAllocStuff) txnUpdateNodePorts(service, oldService *api.Service, d
return txn, nil return txn, nil
} }
func releaseNodePorts(service *api.Service, nodePortOp *portallocator.PortAllocationOperation) { func (al *RESTAllocStuff) releaseNodePorts(service *api.Service, nodePortOp *portallocator.PortAllocationOperation) {
nodePorts := collectServiceNodePorts(service) nodePorts := collectServiceNodePorts(service)
for _, nodePort := range nodePorts { for _, nodePort := range nodePorts {
@ -775,7 +775,7 @@ func releaseNodePorts(service *api.Service, nodePortOp *portallocator.PortAlloca
} }
} }
func updateNodePorts(oldService, newService *api.Service, nodePortOp *portallocator.PortAllocationOperation) error { func (al *RESTAllocStuff) updateNodePorts(oldService, newService *api.Service, nodePortOp *portallocator.PortAllocationOperation) error {
oldNodePortsNumbers := collectServiceNodePorts(oldService) oldNodePortsNumbers := collectServiceNodePorts(oldService)
newNodePorts := []ServiceNodePort{} newNodePorts := []ServiceNodePort{}
portAllocated := map[int]bool{} portAllocated := map[int]bool{}