aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dcaemod
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2020-03-11 13:48:20 -0400
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-03-18 21:00:41 +0000
commit00efe37bb1745ff9e2e070b6bbdb183be9ceef48 (patch)
tree6b45463a7634c9f7be67a22593ffb0c2491092ab /kubernetes/dcaemod
parent0f90269b150bbb38773e421ac754f1c022cf9ea3 (diff)
R6 updates for dcaegen2/dcaemod
Update to bootstrap container 1.12.2 Update to dashboard container 1.3.2 Update to prh 1.5.2 Make runtime-api imports configurable Issue-ID: CCSDK-2158 Issue-ID: DCAEGEN2-2088 Issue-ID: DCAEGEN2-2105 Issue-ID: DCAEGEN2-2120 Issue-ID: DCAEGEN2-2127 Issue-ID: DCAEGEN2-2128 Signed-off-by: Jack Lucas <jflucas@research.att.com> Change-Id: Ie335fc866bc5360bbfc8200fc0e1712b64e05e1b
Diffstat (limited to 'kubernetes/dcaemod')
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml14
-rw-r--r--kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml6
2 files changed, 19 insertions, 1 deletions
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
index 0043e8a95d..8b885895e0 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/templates/deployment.yaml
@@ -49,7 +49,19 @@ spec:
{{- include "common.secret.envFromSecret" (dict "global" . "uid" "dashsecret" "key" "login") | indent 14 }}
- name: DASHBOARD_PASSWORD
{{- include "common.secret.envFromSecret" (dict "global" . "uid" "dashsecret" "key" "password") | indent 14 }}
- - name: ONAPDUBLIN_TOPICURL
+ - name: ONAP_TOPICURL
value: {{ .Values.config.mrTopicURL }}
+ - name: ONAP_IMPORT_CLOUDIFYPLUGIN
+ value: {{ .Values.config.importCloudify }}
+ - name: ONAP_IMPORT_K8SPLUGIN
+ value: {{ .Values.config.importK8S }}
+ - name: ONAP_IMPORT_POLICYPLUGIN
+ value: {{ .Values.config.importPolicy }}
+ - name: ONAP_INPORT_POSTGRESPLUGIN
+ value: {{ .Values.config.importPostgres }}
+ - name: ONAP_IMPORT_CLAMPPLUGIN
+ value: {{ .Values.config.importClamp }}
+ - name: ONAP_IMPORT_DMAAPPLUGIN
+ value: {{ .Values.config.importDMaaP }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
index f21b7f9cb5..592def272f 100644
--- a/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/values.yaml
@@ -34,6 +34,12 @@ config:
dashboardUser: nobody
#dashboardPassword: doesntmatter
mrTopicURL: http://message-router:3904/events
+ importCloudify: https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
+ importK8S: https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+ importPolicy: https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+ importPostgres: https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml
+ importClamp: https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml
+ importDMaaP: https://nexus.onap.org/content/repositories/raw/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml
secrets:
- uid: "dashsecret"