From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Wed, 10 Jul 2019 06:50:21 +0000 (+0000)
Subject: Merge "CDS-UI: support gRPC integration with blueprint processor mS - For deploy... 
X-Git-Tag: 5.0.1-ONAP~219
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f0c49289099ca849306ed439d73beccd8cb75f37;hp=ca4e4411f2c02e78c323e86382c3e0883448f1d1;p=oom.git

Merge "CDS-UI: support gRPC integration with blueprint processor mS - For deploy blueprint functionality"
---

diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index ead1b2edbd..021a6a9425 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
@@ -50,14 +50,22 @@ spec:
           env:
             - name: HOST
               value: 0.0.0.0
-            - name: API_BLUEPRINT_CONTROLLER_BASE_URL
-              value: {{ .Values.config.api.controller.baseUrl }}
-            - name: API_BLUEPRINT_CONTROLLER_AUTH_TOKEN
-              value: {{ .Values.config.api.controller.authToken }}
-            - name: API_BLUEPRINT_PROCESSOR_BASE_URL
-              value: {{ .Values.config.api.processor.baseUrl }}
-            - name: API_BLUEPRINT_PROCESSOR_AUTH_TOKEN
-              value: {{ .Values.config.api.processor.authToken }}
+            - name: APP_ACTION_DEPLOY_BLUEPRINT_GRPC_ENABLED
+              value: {{ .Values.config.app.action.deployBlueprint.grpcEnabled }}
+            - name: API_BLUEPRINT_CONTROLLER_HTTP_BASE_URL
+              value: {{ .Values.config.api.controller.http.baseUrl }}
+            - name: API_BLUEPRINT_CONTROLLER_HTTP_AUTH_TOKEN
+              value: {{ .Values.config.api.controller.http.authToken }}
+            - name: API_BLUEPRINT_PROCESSOR_HHTP_BASE_URL
+              value: {{ .Values.config.api.processor.http.baseUrl }}
+            - name: API_BLUEPRINT_PROCESSOR_HTTP_AUTH_TOKEN
+              value: {{ .Values.config.api.processor.http.authToken }}
+            - name: API_BLUEPRINT_PROCESSOR_GRPC_HOST
+              value: {{ .Values.config.api.processor.grpc.host }}
+            - name: API_BLUEPRINT_PROCESSOR_GRPC_PORT
+              value: {{ .Values.config.api.processor.grpc.port }}
+            - name: API_BLUEPRINT_PROCESSOR_GRPC_AUTH_TOKEN
+              value: {{ .Values.config.api.processor.grpc.authToken }}
           readinessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
index 036b888ea7..1ba8a17049 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -33,13 +33,23 @@ pullPolicy: Always
 
 # application configuration
 config:
+  app:
+    action:
+      deployBlueprint:
+        grpcEnabled: true
   api:
     controller:
-      baseUrl: http://cds-controller-blueprints:8080/api/v1
-      authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+      http:
+       baseUrl: http://cds-controller-blueprints:8080/api/v1
+       authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
     processor:
-      baseUrl: http://cds-blueprints-processor-http:8080/api/v1
-      authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+      http:
+       baseUrl: http://cds-blueprints-processor-http:8080/api/v1
+       authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+      grpc:
+        host: cds-blueprints-processor-grpc
+        port: 9111
+        authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
 
 # default number of instances
 replicaCount: 1