github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Use nodePortOp for allocating healthCheck nodePort

Browse Source
This commit is contained in:
Zihong Zheng 2017-08-03 16:45:42 -07:00
parent a4996c99d4
commit e089c36447
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/registry/core/service/rest.go
View File

@ -124,7 +124,7 @@ func (rs *REST) Create(ctx genericapirequest.Context, obj runtime.Object, includ
// Handle ExternalTraiffc related fields during service creation. // Handle ExternalTraiffc related fields during service creation.
if utilfeature.DefaultFeatureGate.Enabled(features.ExternalTrafficLocalOnly) { if utilfeature.DefaultFeatureGate.Enabled(features.ExternalTrafficLocalOnly) {
if apiservice.NeedsHealthCheck(service) { if apiservice.NeedsHealthCheck(service) {
if err := rs.allocateHealthCheckNodePort(service); err != nil { if err := rs.allocateHealthCheckNodePort(service, nodePortOp); err != nil {
return nil, errors.NewInternalError(err) return nil, errors.NewInternalError(err)
} }
} }
@ -244,7 +244,7 @@ func externalTrafficPolicyUpdate(oldService, service *api.Service) {
// healthCheckNodePortUpdate handles HealthCheckNodePort allocation/release // healthCheckNodePortUpdate handles HealthCheckNodePort allocation/release
// and adjusts HealthCheckNodePort during service update if needed. // and adjusts HealthCheckNodePort during service update if needed.
func (rs *REST) healthCheckNodePortUpdate(oldService, service *api.Service) (bool, error) { func (rs *REST) healthCheckNodePortUpdate(oldService, service *api.Service, nodePortOp *portallocator.PortAllocationOperation) (bool, error) {
neededHealthCheckNodePort := apiservice.NeedsHealthCheck(oldService) neededHealthCheckNodePort := apiservice.NeedsHealthCheck(oldService)
oldHealthCheckNodePort := oldService.Spec.HealthCheckNodePort oldHealthCheckNodePort := oldService.Spec.HealthCheckNodePort
@ -257,7 +257,7 @@ func (rs *REST) healthCheckNodePortUpdate(oldService, service *api.Service) (boo
// Insert health check node port into the service's HealthCheckNodePort field if needed. // Insert health check node port into the service's HealthCheckNodePort field if needed.
case !neededHealthCheckNodePort && needsHealthCheckNodePort: case !neededHealthCheckNodePort && needsHealthCheckNodePort:
glog.Infof("Transition to LoadBalancer type service with ExternalTrafficPolicy=Local") glog.Infof("Transition to LoadBalancer type service with ExternalTrafficPolicy=Local")
if err := rs.allocateHealthCheckNodePort(service); err != nil { if err := rs.allocateHealthCheckNodePort(service, nodePortOp); err != nil {
return false, errors.NewInternalError(err) return false, errors.NewInternalError(err)
} }
@ -265,12 +265,8 @@ func (rs *REST) healthCheckNodePortUpdate(oldService, service *api.Service) (boo
// Free the existing healthCheckNodePort and clear the HealthCheckNodePort field. // Free the existing healthCheckNodePort and clear the HealthCheckNodePort field.
case neededHealthCheckNodePort && !needsHealthCheckNodePort: case neededHealthCheckNodePort && !needsHealthCheckNodePort:
glog.Infof("Transition to non LoadBalancer type service or LoadBalancer type service with ExternalTrafficPolicy=Global") glog.Infof("Transition to non LoadBalancer type service or LoadBalancer type service with ExternalTrafficPolicy=Global")
err := rs.serviceNodePorts.Release(int(oldHealthCheckNodePort)) glog.V(4).Infof("Releasing healthCheckNodePort: %d", oldHealthCheckNodePort)
if err != nil { nodePortOp.ReleaseDeferred(int(oldHealthCheckNodePort))
glog.Warningf("error releasing service health check %s node port %d: %v", service.Name, oldHealthCheckNodePort, err)
return false, errors.NewInternalError(fmt.Errorf("failed to free health check nodePort: %v", err))
}
glog.Infof("Freed health check nodePort: %d", oldHealthCheckNodePort)
// Clear the HealthCheckNodePort field. // Clear the HealthCheckNodePort field.
service.Spec.HealthCheckNodePort = 0 service.Spec.HealthCheckNodePort = 0
@ -354,7 +350,7 @@ func (rs *REST) Update(ctx genericapirequest.Context, name string, objInfo rest.
// Handle ExternalTraiffc related updates. // Handle ExternalTraiffc related updates.
if utilfeature.DefaultFeatureGate.Enabled(features.ExternalTrafficLocalOnly) { if utilfeature.DefaultFeatureGate.Enabled(features.ExternalTrafficLocalOnly) {
success, err := rs.healthCheckNodePortUpdate(oldService, service) success, err := rs.healthCheckNodePortUpdate(oldService, service, nodePortOp)
if !success || err != nil { if !success || err != nil {
return nil, false, err return nil, false, err
} }
@ -474,24 +470,24 @@ func findRequestedNodePort(port int, servicePorts []api.ServicePort) int {
} }
// allocateHealthCheckNodePort allocates health check node port to service. // allocateHealthCheckNodePort allocates health check node port to service.
func (rs *REST) allocateHealthCheckNodePort(service *api.Service) error { func (rs *REST) allocateHealthCheckNodePort(service *api.Service, nodePortOp *portallocator.PortAllocationOperation) error {
healthCheckNodePort := service.Spec.HealthCheckNodePort healthCheckNodePort := service.Spec.HealthCheckNodePort
if healthCheckNodePort != 0 { if healthCheckNodePort != 0 {
// If the request has a health check nodePort in mind, attempt to reserve it. // If the request has a health check nodePort in mind, attempt to reserve it.
err := rs.serviceNodePorts.Allocate(int(healthCheckNodePort)) err := nodePortOp.Allocate(int(healthCheckNodePort))
if err != nil { if err != nil {
return fmt.Errorf("failed to allocate requested HealthCheck NodePort %v: %v", return fmt.Errorf("failed to allocate requested HealthCheck NodePort %v: %v",
healthCheckNodePort, err) healthCheckNodePort, err)
} }
glog.Infof("Reserved user requested nodePort: %d", healthCheckNodePort) glog.V(4).Infof("Reserved user requested healthCheckNodePort: %d", healthCheckNodePort)
} else { } else {
// If the request has no health check nodePort specified, allocate any. // If the request has no health check nodePort specified, allocate any.
healthCheckNodePort, err := rs.serviceNodePorts.AllocateNext() healthCheckNodePort, err := nodePortOp.AllocateNext()
if err != nil { if err != nil {
return fmt.Errorf("failed to allocate a HealthCheck NodePort %v: %v", healthCheckNodePort, err) return fmt.Errorf("failed to allocate a HealthCheck NodePort %v: %v", healthCheckNodePort, err)
} }
service.Spec.HealthCheckNodePort = int32(healthCheckNodePort) service.Spec.HealthCheckNodePort = int32(healthCheckNodePort)
glog.Infof("Reserved allocated nodePort: %d", healthCheckNodePort) glog.V(4).Infof("Reserved allocated healthCheckNodePort: %d", healthCheckNodePort)
} }
return nil return nil
} }