diff options
| author |   Lusheng Ji <lji@research.att.com> | 2018-04-30 12:03:37 -0400 |
|---|---|---|
| committer | Lusheng Ji <lji@research.att.com> | 2018-05-11 01:07:29 +0000 |
| commit | 98f947ee316f766d91e6f434b91364d69af1d263 (patch) | |
| tree | ed004844a614eb9a00d7443627a16063ae14f974 /kubernetes/dcaegen2/charts/dcae-cloudify-manager | |
| parent | 67a7d1a04eadd5e03f914ddcdbcc0542cf6c3cbc (diff) | |
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 <lji@research.att.com>
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-cloudify-manager')
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml | 2 |
2 files changed, 3 insertions, 2 deletions
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" |