summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2019-04-25 14:52:58 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-25 14:52:58 +0000
commite5fa9fbdcbb3dfc403c33bb9b559c2e81291899e (patch)
tree6a2ca4862ecd3878ba9d0a6722bce930ac5009b1 /kubernetes
parent99b4523cfe191ab8d1f0d82bb68ab1605f881dab (diff)
parentda5841f39775c78035f1354ce7b8caf5f8f4f968 (diff)
Merge "update dashboard input"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml5
-rw-r--r--kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml2
3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
index ff2c39261b..e40a03068c 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-dashboard-inputs.yaml
@@ -27,6 +27,6 @@ database_name: "dashboard_pg"
cloudify_ip: {{ .Values.config.address.cm }}
cloudify_user: "admin"
cloudify_password: "admin"
-consul_url: {{ .Values.config.address.consul.host }}
+consul_url: {{ .Values.config.address.consul_ui }}
postgres_port: "5432"
replicas: 1
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index d985f4fb9c..bc9b7a0db3 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -27,7 +27,7 @@ global:
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
tlsRepository: nexus3.onap.org:10001
- tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.2-STAGING-latest
+ tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.3-STAGING-latest
config:
logstashServiceName: log-ls
@@ -37,6 +37,7 @@ config:
consul:
host: consul-server
port: 8500
+ consul_ui: consul-server-ui
cm: dcae-cloudify-manager
dashboard:
port: 30418
@@ -89,7 +90,7 @@ postgres:
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.14-STAGING-latest
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.15-STAGING-latest
default_k8s_location: central
# DCAE component images to be deployed via Cloudify Manager
diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
index 8ecf448af0..a432226b57 100644
--- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml
@@ -44,7 +44,7 @@ config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.cm-container:1.6.1-STAGING-latest
+image: onap/org.onap.dcaegen2.deployments.cm-container:1.6.2-STAGING-latest
pullPolicy: Always
# name of shared ConfigMap with kubeconfig for multiple clusters