additional changes:
1. Delete dcae_ns setting in values files--forces
CM to deploy into the common namespace.
2. Conditionally set image name in k8s-inventory-inputs.yaml
3. Comment out componentImage setting--use image version
specified in blueprints.
4. Add missing "---" in CM templates/service.yaml
5. Update image versions for bootstrap, healtcheck
changes to values.yaml file:
1. update doker versions
2. use onap as namespace for DCAE pods
Chages to dcae-healthcheck values.yaml file
1. check health for DACE pods under namespace onap
Issue-ID: DCAEGEN2-479
Issue-ID: DCAEGEN2-490
Issue-ID: DCAEGEN2-493
Change-Id: I40d8f0b40b2b6bbf1407493a7d8c03cef856fd9c
Signed-off-by: Lusheng Ji <lji@research.att.com>
Signed-off-by: Jack Lucas <jflucas@research.att.com>
sdc_msg_bus_address: '{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}'
postgres_user_inventory: "postgres"
postgres_password_inventory: "onap123"
sdc_msg_bus_address: '{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}'
postgres_user_inventory: "postgres"
postgres_password_inventory: "onap123"
+{{ if .Values.componentImages.service_change_handler }}
service_change_handler_image: {{ .Values.componentImages.service_change_handler }}
service_change_handler_image: {{ .Values.componentImages.service_change_handler }}
{{ if .Values.componentImages.inventory }}
inventory_image: "{{ .Values.componentImages.inventory }}"
{{ end }}
{{ if .Values.componentImages.inventory }}
inventory_image: "{{ .Values.componentImages.inventory }}"
{{ end }}
key: password
- name: CONSUL
value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }}
key: password
- name: CONSUL
value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }}
+ - name: DCAE_NAMESPACE
+ value: {{ .Values.dcae_ns | default "" }}
+ - name: ONAP_NAMESPACE
+ value: {{ include "common.namespace" . }}
volumes:
- name: {{ include "common.fullname" . }}-dcae-inputs
configMap:
volumes:
- name: {{ include "common.fullname" . }}-dcae-inputs
configMap:
# application image
repository: nexus3.onap.org:10001
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:latest
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.1.10
# DCAE component images to be deployed via Cloudify Manager
# Use to override default setting in blueprints
componentImages:
#TODO for further investigation: input template expansion issues if we comment this out
# DCAE component images to be deployed via Cloudify Manager
# Use to override default setting in blueprints
componentImages:
#TODO for further investigation: input template expansion issues if we comment this out
- config_binding_service: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.1.5
+ config_binding_service: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:latest
# deployment_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler:2.1.1
# holmes_engine: nexus3.onap.org:10001//onap/holmes/engine-management:v1.0.0
# holmes_rules: nexus3.onap.org:10001/onap/holmes/rule-management:v1.0.0
# deployment_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler:2.1.1
# holmes_engine: nexus3.onap.org:10001//onap/holmes/engine-management:v1.0.0
# holmes_rules: nexus3.onap.org:10001/onap/holmes/rule-management:v1.0.0
- inventory: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:3.0.1
- policy_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler:2.4.1
- service_change_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.3
+# inventory: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:3.0.1
+# policy_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler:2.4.2
+# service_change_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.4
# tca: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container.tca-cdap-container:1.0.0
# ves: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace
# tca: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container.tca-cdap-container:1.0.0
# ves: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace
-#============LICENSE_START========================================================
+ #============LICENSE_START========================================================
# ================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Copyright © 2018 Amdocs, Bell Canada
# ================================================================================
# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
# Copyright © 2018 Amdocs, Bell Canada
type: ExternalName
externalName: {{ .Values.service.name }}.{{ include "common.namespace" . }}.svc.cluster.local
{{ end }}
type: ExternalName
externalName: {{ .Values.service.name }}.{{ include "common.namespace" . }}.svc.cluster.local
{{ end }}
# Provide alternate name for consul in common namespace to support CM plugin discovery
apiVersion: v1
kind: Service
# Provide alternate name for consul in common namespace to support CM plugin discovery
apiVersion: v1
kind: Service
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace
periodSeconds: 10
# application image
repository: nexus3.onap.org:10001
periodSeconds: 10
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.healthcheck-container:1.0.0
+image: onap/org.onap.dcaegen2.deployments.healthcheck-container:1.1.0
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace
# Kubernetes namespace for components deployed via Cloudify manager
# If empty, use the common namespace