From 2e5e5aca6dadce74b5566ac5e3154cb5886a0c5f Mon Sep 17 00:00:00 2001 From: Eddie Arrage Date: Tue, 3 Apr 2018 02:50:36 +0000 Subject: Fix Nginx lb in k8s/istio - Provide workaround to make nginx lb work properly - nginx_client sample can modify default load balancing from three to two servers at runtime - Ensure port 9180 is used for default deploy for lb and servers - Modify render_yaml to specify deploy_name so that clover-server1, 2, 3 can be used for default lb config - Ensure proxy template is aligned to lb to allow the source IP from originating host to be propagated to final destination - Fix default nginx proxy server_name to 'proxy-access-control' and change default proxy destination to 'http-lb' - Split lb service_type to 'lbv1' and 'lbv2' to provide an example of how to modify the run-time configuration of the load balancer after deployment - modify http-lb-v2 to use clover-server4/5 instead of the defualt clover-server1/2/3 - modify http-lb-v1 to use clover-server1/2 instead of 1/2/3 - Aligned pod IP retrival method with nginx_client.py Change-Id: I73fa60a69c93ae1e82a477ef6283c00f67a21360 Signed-off-by: Eddie Arrage (cherry picked from commit 5e213108dfade163a85cff9b9156de9bd2c18887) --- samples/services/nginx/docker/grpc/nginx_client.py | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) (limited to 'samples/services/nginx/docker/grpc/nginx_client.py') diff --git a/samples/services/nginx/docker/grpc/nginx_client.py b/samples/services/nginx/docker/grpc/nginx_client.py index dfefb08..7a07464 100644 --- a/samples/services/nginx/docker/grpc/nginx_client.py +++ b/samples/services/nginx/docker/grpc/nginx_client.py @@ -16,18 +16,24 @@ import nginx_pb2 import nginx_pb2_grpc -def run(args): +def run(args, grpc_port='50054'): # get pod ip for grpc pod_ip = get_podip(args['service_name']) if pod_ip == '': - return "Cant find service with name: {}".format(args['service_name']) - nginx_grpc = pod_ip + ':50054' + return "Cant find service: {}".format(args['service_name']) + nginx_grpc = pod_ip + ':' + grpc_port channel = grpc.insecure_channel(nginx_grpc) stub = nginx_pb2_grpc.ControllerStub(channel) # modify config - if args['service_type'] == 'lb': - modify_lb(stub) + if args['service_type'] == 'lbv1': + slb_list = pickle.dumps( + ['clover-server1:9180', 'clover-server2:9180']) + modify_lb(stub, slb_list) + if args['service_type'] == 'lbv2': + slb_list = pickle.dumps( + ['clover-server4:9180', 'clover-server5:9180']) + modify_lb(stub, slb_list) elif args['service_type'] == 'proxy': modify_proxy(stub) elif args['service_type'] == 'server': @@ -38,14 +44,16 @@ def run(args): def get_podip(pod_name): - config.load_kube_config() - v1 = client.CoreV1Api() - ret = v1.list_pod_for_all_namespaces(watch=False) ip = '' - for i in ret.items: - if i.metadata.name.lower().find(pod_name.lower()) != -1: - print(i.status.pod_ip) - ip = i.status.pod_ip + if pod_name != '': + config.load_kube_config() + v1 = client.CoreV1Api() + ret = v1.list_pod_for_all_namespaces(watch=False) + for i in ret.items: + if i.metadata.name.lower().find(pod_name.lower()) != -1: + print("Pod IP: {}".format(i.status.pod_ip)) + ip = i.status.pod_ip + return str(ip) return str(ip) @@ -64,11 +72,9 @@ def modify_server(stub): print(response.message) -def modify_lb(stub): - slb_list = pickle.dumps( - ['clover-server1', 'clover-server2', 'clover-server3']) +def modify_lb(stub, slb_list): response = stub.ModifyLB(nginx_pb2.ConfigLB( - server_port='9188', server_name='http-lb', + server_port='9180', server_name='http-lb', slb_list=slb_list, slb_group='cloverlb', lb_path='/')) print(response.message) -- cgit 1.2.3-korg