diff options
Diffstat (limited to 'samples/services/nginx/docker')
4 files changed, 46 insertions, 20 deletions
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) diff --git a/samples/services/nginx/docker/grpc/nginx_grpc_server.py b/samples/services/nginx/docker/grpc/nginx_grpc_server.py index 6f2de0f..1dfe708 100644 --- a/samples/services/nginx/docker/grpc/nginx_grpc_server.py +++ b/samples/services/nginx/docker/grpc/nginx_grpc_server.py @@ -33,8 +33,8 @@ class Controller(nginx_pb2_grpc.ControllerServicer): # self.template_file = 'templates/proxy.template' self.template_file = '/grpc/templates/proxy.template' self.ModifyProxy(nginx_pb2.ConfigProxy( - server_port='9180', server_name='http-proxy', - location_path='/', proxy_path='http://clover-server:9180', + server_port='9180', server_name='proxy-access-control', + location_path='/', proxy_path='http://http-lb:9180', mirror_path='http://snort-ids:80'), "") if service_type == "server": # self.template_file = 'templates/server.template' @@ -47,7 +47,8 @@ class Controller(nginx_pb2_grpc.ControllerServicer): # self.template_file = 'templates/lb.template' self.template_file = '/grpc/templates/lb.template' slb_list = pickle.dumps( - ['clover-server1', 'clover-server2', 'clover-server3']) + ['clover-server1:9180', 'clover-server2:9180', + 'clover-server3:9180']) self.ModifyLB(nginx_pb2.ConfigLB( server_port='9180', server_name='http-lb', slb_list=slb_list, diff --git a/samples/services/nginx/docker/grpc/templates/lb.template b/samples/services/nginx/docker/grpc/templates/lb.template index 4866408..37de1af 100644 --- a/samples/services/nginx/docker/grpc/templates/lb.template +++ b/samples/services/nginx/docker/grpc/templates/lb.template @@ -61,10 +61,20 @@ http { upstream {{ slb_group }} { {%- for item in slb_list %} - server {{ item }}; + server 127.0.0.1:800{{ loop.index }}; {%- endfor %} } + {%- for item in slb_list %} + server { + listen 800{{ loop.index }}; + location / { + proxy_http_version 1.1; + proxy_pass http://{{ item }}; + } + } + {%- endfor %} + server { listen {{ server_port }}; server_name {{ server_name }}; @@ -73,6 +83,9 @@ http { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto http; + proxy_set_header X-Real-IP $remote_addr; proxy_pass http://{{ slb_group }}; } diff --git a/samples/services/nginx/docker/grpc/templates/proxy.template b/samples/services/nginx/docker/grpc/templates/proxy.template index 72d611e..e7305b3 100644 --- a/samples/services/nginx/docker/grpc/templates/proxy.template +++ b/samples/services/nginx/docker/grpc/templates/proxy.template @@ -67,6 +67,9 @@ http { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto http; + proxy_set_header X-Real-IP $remote_addr; proxy_pass {{ proxy_path }}; post_action @post_ids; @@ -76,6 +79,9 @@ http { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto http; + proxy_set_header X-Real-IP $remote_addr; proxy_pass {{ mirror_path }}; } |