From 98f947ee316f766d91e6f434b91364d69af1d263 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Mon, 30 Apr 2018 12:03:37 -0400 Subject: Correct input yaml file name for Holmes Rules Eng 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 Signed-off-by: Jack Lucas --- .../resources/inputs/k8s-holmes_rules-input.yaml | 23 ---------------------- .../resources/inputs/k8s-holmes_rules-inputs.yaml | 23 ++++++++++++++++++++++ .../resources/inputs/k8s-inventory-inputs.yaml | 2 ++ .../charts/dcae-bootstrap/templates/job.yaml | 4 ++++ .../dcaegen2/charts/dcae-bootstrap/values.yaml | 12 +++++------ .../dcae-cloudify-manager/templates/service.yaml | 3 ++- .../charts/dcae-cloudify-manager/values.yaml | 2 +- .../dcaegen2/charts/dcae-healthcheck/values.yaml | 4 ++-- 8 files changed, 40 insertions(+), 33 deletions(-) delete mode 100644 kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml create mode 100644 kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml deleted file mode 100644 index 1a808d4eb7..0000000000 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-input.yaml +++ /dev/null @@ -1,23 +0,0 @@ -#============LICENSE_START======================================================== -#================================================================================= -# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. -# 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========================================================= - -{ - "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", - "pgaas_cluster_name" : "{{ .Values.postgres.service.name2 }}.{{include "common.namespace" . }}", - "database_name":"holmes" -} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml new file mode 100644 index 0000000000..1a808d4eb7 --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml @@ -0,0 +1,23 @@ +#============LICENSE_START======================================================== +#================================================================================= +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# 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========================================================= + +{ + "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", + "pgaas_cluster_name" : "{{ .Values.postgres.service.name2 }}.{{include "common.namespace" . }}", + "database_name":"holmes" +} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml index 8b5da2efe6..f2127606b5 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml @@ -24,7 +24,9 @@ sdc_environment_name: "AUTO" 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 }} +{{ end }} {{ if .Values.componentImages.inventory }} inventory_image: "{{ .Values.componentImages.inventory }}" {{ end }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml index 02909f79b7..a89ad7d710 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml @@ -81,6 +81,10 @@ spec: 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: diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index 7f1dcdb745..78b57b9d67 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -60,23 +60,23 @@ postgres: # 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 - 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 - 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 -dcae_ns: "dcae" +# dcae_ns: "onap" diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml index 4b76523c57..752cfe0f26 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml @@ -1,4 +1,4 @@ -#============LICENSE_START======================================================== + #============LICENSE_START======================================================== # ================================================================================ # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # Copyright © 2018 Amdocs, Bell Canada @@ -63,6 +63,7 @@ spec: 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 diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml index 41c5191609..9e2426b92f 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml @@ -66,4 +66,4 @@ service: # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace -dcae_ns: "dcae" +# dcae_ns: "dcae" diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml index d9a554cfe6..4e19c78a19 100644 --- a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml @@ -45,9 +45,9 @@ readiness: 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 -dcae_ns: "dcae" +# dcae_ns: "onap" -- cgit 1.2.3-korg