From 01cb1abd0865f7df56296bb6d492ac240fdb8570 Mon Sep 17 00:00:00 2001 From: vagrant Date: Sun, 16 Sep 2018 06:36:46 +0000 Subject: Update DCAE values.yaml for r3 images/input Revising version of InventoryAPI, DH and PH REbased to resolve merge conflict Change-Id: I049203f1c386f08060834d05136590ee3c2ed7fa Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-772 --- .../resources/inputs/k8s-hv_ves-inputs.yaml | 20 ++++++++++++++++++++ .../resources/inputs/k8s-prh-inputs.yaml | 20 ++++++++++++++++++++ .../resources/inputs/k8s-snmptrap-inputs.yaml | 21 +++++++++++++++++++++ .../dcaegen2/charts/dcae-bootstrap/values.yaml | 7 +++++-- 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml create mode 100644 kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml create mode 100644 kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml new file mode 100644 index 0000000000..a6fbea1e1d --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-hv_ves-inputs.yaml @@ -0,0 +1,20 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +{{ if .Values.componentImages.hv_ves }} +tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.hv_ves }} +{{ end }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml new file mode 100644 index 0000000000..1491e731d8 --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-prh-inputs.yaml @@ -0,0 +1,20 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +{{ if .Values.componentImages.prh }} +tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.prh }} +{{ end }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml new file mode 100644 index 0000000000..e1ae791af8 --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-snmptrap-inputs.yaml @@ -0,0 +1,21 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright © 2018 Amdocs, Bell Canada +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +{{ if .Values.componentImages.snmptrap }} +tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.snmptrap }} +{{ end }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index 35af6395eb..3a663d3e16 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -67,15 +67,18 @@ image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.2 # DCAE component images to be deployed via Cloudify Manager # Use to override default setting in blueprints componentImages: - config_binding_service: onap/org.onap.dcaegen2.platform.configbinding:2.1.5 + config_binding_service: onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3 deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.0.2 - holmes_engine: onap/holmes/engine-management:1.2.0-STAGING-latest holmes_rules: onap/holmes/rule-management:1.2.0-STAGING-latest + holmes_engine: onap/holmes/engine-management:1.2.0-STAGING-latest inventory: onap/org.onap.dcaegen2.platform.inventory-api:3.0.4 policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.3.1 service_change_handler: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5 tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0 ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1 + snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0 + prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.0.0 + hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0.0-SNAPSHOT # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace -- cgit 1.2.3-korg