Merge "[SDC] Change default access mode for cert PVC"

[oom.git] / kubernetes / cds / charts / cds-ui / templates / deployment.yaml

diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index ead1b2e..79cffd1 100644 (file)
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
@@ -21,7 +21,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -29,7 +29,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
         name: {{ include "common.fullname" . }}
     spec:
       containers:
@@ -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_HTTP_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 }}