From 1a999760f15fdcccffd259b053c517ea8332a408 Mon Sep 17 00:00:00 2001
From: earrage <eddie.arrage@huawei.com>
Date: Thu, 11 Oct 2018 14:11:31 -0700
Subject: Add nginx services control functionality

- Modify nginx server template to use clover-controller
in clover-system namespace for file upload
- Add ability to set nginx server paths and move uploaded files
in clover-controller and set/get file upload metadata
- Add cloverctl commands to set nginx server and lb configurations
- Add example yaml files to configure nginx server and
lb v1/v2 from cloverctl
- Modify service definition for http-lb versions to distinguish
the two versions for GRPC messaging from clover-controller in SDC
deployment yaml

Change-Id: I5c6866c5ff3de358939c58ea8c0bde64a69c6eca
Signed-off-by: earrage <eddie.arrage@huawei.com>
---
 samples/scenarios/service_delivery_controller.yaml | 26 ++++++++++++++++++++--
 .../service_delivery_controller_opnfv.yaml         | 26 ++++++++++++++++++++--
 .../nginx/docker/grpc/templates/server.template    |  2 +-
 3 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'samples')

diff --git a/samples/scenarios/service_delivery_controller.yaml b/samples/scenarios/service_delivery_controller.yaml
index b9c3506..34e2df0 100644
--- a/samples/scenarios/service_delivery_controller.yaml
+++ b/samples/scenarios/service_delivery_controller.yaml
@@ -226,6 +226,7 @@ spec:
       labels:
         app: http-lb
         version: v1
+        name: http-lb-v1
     spec:
       containers:
         - name: http-lb
@@ -247,6 +248,7 @@ spec:
       labels:
         app: http-lb
         version: v2
+        name: http-lb-v2
     spec:
       containers:
         - name: http-lb
@@ -263,13 +265,33 @@ metadata:
     app: http-lb
 spec:
   ports:
-  - port: 50054
-    name: grpc
   - port: 9180
     name: http
   selector:
     app: http-lb
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: http-lb-v1
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  selector:
+    name: http-lb-v1
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: http-lb-v2
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  selector:
+    name: http-lb-v2
+---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
diff --git a/samples/scenarios/service_delivery_controller_opnfv.yaml b/samples/scenarios/service_delivery_controller_opnfv.yaml
index ceba36f..cb4743f 100644
--- a/samples/scenarios/service_delivery_controller_opnfv.yaml
+++ b/samples/scenarios/service_delivery_controller_opnfv.yaml
@@ -226,6 +226,7 @@ spec:
       labels:
         app: http-lb
         version: v1
+        name: http-lb-v1
     spec:
       containers:
         - name: http-lb
@@ -247,6 +248,7 @@ spec:
       labels:
         app: http-lb
         version: v2
+        name: http-lb-v2
     spec:
       containers:
         - name: http-lb
@@ -263,13 +265,33 @@ metadata:
     app: http-lb
 spec:
   ports:
-  - port: 50054
-    name: grpc
   - port: 9180
     name: http
   selector:
     app: http-lb
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: http-lb-v1
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  selector:
+    name: http-lb-v1
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: http-lb-v2
+spec:
+  ports:
+  - port: 50054
+    name: grpc
+  selector:
+    name: http-lb-v2
+---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
diff --git a/samples/services/nginx/docker/grpc/templates/server.template b/samples/services/nginx/docker/grpc/templates/server.template
index c1582fa..2ca5410 100644
--- a/samples/services/nginx/docker/grpc/templates/server.template
+++ b/samples/services/nginx/docker/grpc/templates/server.template
@@ -116,7 +116,7 @@ http {
             }
 
             location @return_config {
-                proxy_pass http://clover-controller:80;
+                proxy_pass http://clover-controller.clover-system:80;
                 proxy_http_version 1.1;
             }
 
-- 
cgit 1.2.3-korg