diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-03-19 11:38:42 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-03-21 11:43:43 -0400 |
| commit | 0108b5284cf2a3e80334a3c0fd44e1404e2ebf59 (patch) | |
| tree | bdfbd156392f56b12eef01f3544ad3a28342beac /kubernetes/dcaegen2/charts/dcae-bootstrap | |
| parent | 4e4c628e28b5b6c16f30afbb8e2eba50f9f4280e (diff) | |
Add support for multiple k8s clusters
Issue-ID: DCAEGEN2-1136
Change-Id: I2c2f440bf9793b7398d72c5fb97bd9b3b1309416
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-bootstrap')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json | 1 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json index 3f2168b6af..51d31a355b 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/config/k8s-plugin.json @@ -19,6 +19,7 @@ { "namespace" : "{{ if .Values.dcae_ns }}{{ .Values.dcae_ns}}{{ else }}{{include "common.namespace" . }}{{ end}}", "consul_dns_name" : "{{ .Values.config.address.consul.host }}.{{ include "common.namespace" . }}", + "default_k8s_location" : "{{ .Values.default_k8s_location }}", "image_pull_secrets" : ["{{ include "common.namespace" . }}-docker-registry-key"], "filebeat": { diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index 347e4a9620..8d525cb051 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -81,7 +81,8 @@ postgres: # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.9 +image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.10-STAGING-latest +default_k8s_location: central # DCAE component images to be deployed via Cloudify Manager # Use to override default setting in blueprints |