From 01b52e8b34a9b3742217df311da2c40325404e9a Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Tue, 10 Apr 2018 22:28:36 +0200 Subject: [PATCH] Update git submodules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * Update docs/submodules/clover from branch 'stable/fraser' - Updated from global requirements Change-Id: I9539985b01d425e3e0350291a715a44e128c6075 Signed-off-by: Cédric Ollivier - Add clover initial docker image build script - install dependent deb/pip packages - install basic tools istioctl, kubectl - install clover source code - build/upload docker image script - update requirements.txt - update module import path - To use this image use need setup kube-config file. e.g. `docker run -v /root/config:/root/.kube/config -it clover bash` Change-Id: I91044bb99ce8e2b785ef03212d961a97b3d42233 Signed-off-by: QiLiang (cherry picked from commit c68b7b8380ea8d2ac4da6b4739c6b8e157bb952b) - Merge "Aligned snort-ids default config for SDC scenario" into stable/fraser - Merge "Added toplevel manifests for SDC sample scenario" into stable/fraser - Merge "Fix Nginx lb in k8s/istio" into stable/fraser - Add existing public redis pod/service - Use a community yaml for redis in k8s as simple data store - Redis can be used for tracing and also by the snort-ids to store alerts that can be processed by other services - If flannel is used, the redis CLI can be accessed on the host OS with redis-cli -h - Within the k8s cluster, the redis service can be accessed with DNS using name 'redis' - The same yaml for redis is also included in toplevel manifest for SDC scenario. Included here if intention is to use separately (tracing only) Change-Id: Ibad283a4cc8938fe01f5de6b7743bdb5511be3af Signed-off-by: Eddie Arrage (cherry picked from commit 66cc1be27b7fbb27c01a726663e42608eb411672) - 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) - Aligned snort-ids default config for SDC scenario - Modified snort-ids alert process to use k8s DNS name 'proxy-access-control' to align with SDC scenario naming - Added default port 50054 to the manifest yaml template and rendering script for communication with proxy-access-control Change-Id: Ib04ee75e5d8ea9921b16b3b4469bed87b1cd2018 Signed-off-by: Eddie Arrage (cherry picked from commit 30d36864d491d41fcb4700b5363b68086e239e5a) - Added toplevel manifests for SDC sample scenario - Added missing k8s manifest yaml files for overall service delivery controller scenario - cannot be deployed coherently without this manifest - One file for private docker registry and one for opnfv public registry - Outlined in JIRA ticket CLOVER-16 and validated per description - Includes ingress rule, community redis pod/service and deployments for http-lb (v1/v2), snort-ids, proxy-access-controller, and clover-server1-5 - All above pod/deployment naming matches default container configuration - Tested with istio manual injection Change-Id: Ia03782b38020d744ab00c99adbf4832d15bbd9f3 Signed-off-by: Eddie Arrage (cherry picked from commit 7381d8f19074c2d1bff6982d096d2c23c599172b) --- docs/submodules/clover | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/submodules/clover b/docs/submodules/clover index 66cc1be27..6d7e971c0 160000 --- a/docs/submodules/clover +++ b/docs/submodules/clover @@ -1 +1 @@ -Subproject commit 66cc1be27b7fbb27c01a726663e42608eb411672 +Subproject commit 6d7e971c0c44d5e24af850fb71bc7a38acebe9a0 -- 2.16.6