summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <adetalhouet89@gmail.com>2019-05-09 00:38:40 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-09 00:38:40 +0000
commitc21310dbf29b3dae274fa17fb67bcf87b8398ec0 (patch)
tree0145eca35f79ccb781820da702a7dad6f1c5aa1f
parente6f4bc0caefe13cf20e316274611537b195d57a6 (diff)
parente7a4aa70b81c4d357b4c80a8ee170e9b011f95a9 (diff)
Merge "Add CDS-UI env variables to comunicate with blueprint mS"
-rw-r--r--kubernetes/cds/charts/cds-ui/templates/deployment.yaml8
-rw-r--r--kubernetes/cds/charts/cds-ui/values.yaml9
2 files changed, 16 insertions, 1 deletions
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index 134e6b7443..ead1b2edbd 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
@@ -50,6 +50,14 @@ 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 }}
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 9139d2049d..9b0c3469d6 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -33,6 +33,13 @@ pullPolicy: Always
# application configuration
config:
+ api:
+ controller:
+ baseUrl: http://cds-controller-blueprints:8080/api/v1
+ authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+ processor:
+ baseUrl: http://cds-blueprints-processor:8080/api/v1
+ authToken: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
# default number of instances
replicaCount: 1
@@ -61,7 +68,7 @@ readiness:
service:
type: NodePort
- portName: ui
+ portName: cds-ui
name: cds-ui
nodePort: 97
internalPort: 3000