diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2019-04-08 13:23:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-08 13:23:18 +0000 |
| commit | a0d5935e3a8907a7f98fa7a34cf94e38efb50c46 (patch) | |
| tree | 3c17ec9603b63475c476e610d9dbd39022435dcb /kubernetes/dcaegen2/charts/dcae-bootstrap | |
| parent | 5c2fe5c4f4e6ee6cd987a154d68697211623fdb7 (diff) | |
| parent | 0108b5284cf2a3e80334a3c0fd44e1404e2ebf59 (diff) | |
Merge "Add support for multiple k8s clusters"
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 |