Merge "R6 updates for dcaegen2/dcaemod"

4 files changed, 22 insertions, 4 deletions

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index 872d01d6ae..a3850adc7e 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -109,7 +109,7 @@ mongo:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.12.0
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.12.2
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager
@@ -121,7 +121,7 @@ componentImages:
   tcagen2: onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.0.0
   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.5.3
   snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
-  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.5.0
+  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.5.2
   hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.4.0
 
 # Resource Limit flavor -By Default using small
diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
index 9d38659f61..fd7069450e 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
@@ -44,7 +44,7 @@ config:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.3.1
+image: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.3.2
 pullPolicy: Always
 
 # probe configuration parameters
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"