From 72895a84a9670d6f6f8921681c5bbe4b2745319e Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Thu, 3 Jan 2019 17:55:36 +0000 Subject: [PATCH] PR feedback - do not change protocol for externalTrafficPolicy = Local --- pkg/cloudprovider/providers/aws/aws.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 5487f92dde1..c88c9aff2f8 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -3589,16 +3589,9 @@ func (c *Cloud) EnsureLoadBalancer(ctx context.Context, clusterName string, apiS } } - annotationProtocol := strings.ToLower(annotations[ServiceAnnotationLoadBalancerBEProtocol]) - var hcProtocol string if path, healthCheckNodePort := service.GetServiceHealthCheckPathPort(apiService); path != "" { klog.V(4).Infof("service %v (%v) needs health checks on :%d%s)", apiService.Name, loadBalancerName, healthCheckNodePort, path) - if annotationProtocol == "https" || annotationProtocol == "ssl" { - hcProtocol = "HTTPS" - } else { - hcProtocol = "HTTP" - } - err = c.ensureLoadBalancerHealthCheck(loadBalancer, hcProtocol, healthCheckNodePort, path, annotations) + err = c.ensureLoadBalancerHealthCheck(loadBalancer, "HTTP", healthCheckNodePort, path, annotations) if err != nil { return nil, fmt.Errorf("Failed to ensure health check for localized service %v on node port %v: %q", loadBalancerName, healthCheckNodePort, err) } @@ -3613,6 +3606,8 @@ func (c *Cloud) EnsureLoadBalancer(ctx context.Context, clusterName string, apiS tcpHealthCheckPort = int32(*listener.InstancePort) break } + annotationProtocol := strings.ToLower(annotations[ServiceAnnotationLoadBalancerBEProtocol]) + var hcProtocol string if annotationProtocol == "https" || annotationProtocol == "ssl" { hcProtocol = "SSL" } else {