[DCAE][DCAEMOD] Deploy R7 container images

Deploy new versions of cm-container, k8s-bootstrap-container
and healthcheck-container for DCAE.
Deploy a healthcheck-container for DCAEMOD.
Add readiness checks for aaf-cm for dcae-cloudify-manager,
dcae-inventory-api, and dcae-config-binding-service, to
avoid crash loops in the init phase.

Issue-ID: DCAEGEN2-2099
Issue-ID: DCAEGEN2-1789
Issue-ID: DCAEGEN2-2236
Issue-ID: DCAEGEN2-1864
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I473a0cd0e3e00d39e6c33d87781581ec527fbc89

8 files changed, 43 insertions, 5 deletions

diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
index 9009f6b114..13657bd012 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml
@@ -74,7 +74,6 @@ spec:
           - dcae-inventory-api
           - "-t"
           - "15"
-
         env:
         - name: NAMESPACE
           valueFrom:
@@ -96,6 +95,15 @@ spec:
         volumeMounts:
         - mountPath: /opt/app/osaaf
           name: tls-info
+      - name: init-consul
+        image: {{ .Values.global.consulLoaderRepository }}/{{ .Values.global.consulLoaderImage }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        args:
+        - --service
+        - "config-binding-service|config-binding-service.{{ include "common.namespace" . }}|10000"
+        - --service
+        - "config_binding_service|config-binding-service.{{ include "common.namespace" . }}|10000"
+        resources: {}
       containers:
         - name: {{ include "common.name" . }}
           image: "{{ include "common.repository" . }}/{{ .Values.image }}"
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
index a9cac8beac..bc409a549c 100644
--- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml
@@ -107,7 +107,7 @@ mongo:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.12.6
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:2.0.0
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
index 8a03e90333..a21eabc24b 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/templates/deployment.yaml
@@ -41,6 +41,22 @@ spec:
         hostnames:
         - "dcae-cloudify-manager"
       initContainers:
+      - name: {{ include "common.name" . }}-readiness
+        image: {{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        command:
+          - /root/ready.py
+        args:
+          - --container-name
+          - aaf-cm
+          - "-t"
+          - "15"
+        env:
+          - name: NAMESPACE
+            valueFrom:
+              fieldRef:
+                apiVersion: v1
+                fieldPath: metadata.namespace
       - name: {{ include "common.name" . }}-multisite-init
         image: {{ include "common.repository" . }}/{{ .Values.multisiteInitImage }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
index d2bda88577..b7ea4c9e6f 100644
--- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/values.yaml
@@ -46,7 +46,7 @@ config:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.cm-container:2.1.0
+image: onap/org.onap.dcaegen2.deployments.cm-container:3.0.0
 pullPolicy: Always
 
 # name of shared ConfigMap with kubeconfig for multiple clusters
diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
index fe681ca566..596a3988c2 100644
--- a/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/templates/deployment.yaml
@@ -42,6 +42,8 @@ spec:
           args:
             - --container-name
             - consul-server
+            - --container-name
+            - aaf-cm
             - "-t"
             - "15"
           env:
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml
index 555d7ee28a..4d3e3c326c 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/templates/deployment.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================
 # ================================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # Modifications Copyright © 2018 Amdocs, Bell Canada
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -56,6 +56,10 @@ spec:
               port: {{ .Values.service.internalPort }}
             initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
             periodSeconds: {{ .Values.readiness.periodSeconds }}
+          volumeMounts:
+            - mountPath: /opt/app/expected-components.json
+              subPath: expected-components.json
+              name: {{ include "common.fullname" .}}-expected-components
           env:
             - name: DCAE_NAMESPACE
               value: {{ .Values.dcae_ns }}
@@ -63,5 +67,11 @@ spec:
               value: {{ include "common.namespace" . }}
             - name: HELM_RELEASE
               value: {{ include "common.release" . }}
+            - name: DEPLOY_LABEL
+              value: cfydeployment
+      volumes:
+        - name: {{ include "common.fullname" . }}-expected-components
+          configMap:
+            name: {{ include "common.release" . }}-dcae-expected-components
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
index cbde9a157b..ca9486f715 100644
--- a/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-healthcheck/values.yaml
@@ -45,7 +45,7 @@ readiness:
   periodSeconds: 10
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.healthcheck-container:1.3.1
+image: onap/org.onap.dcaegen2.deployments.healthcheck-container:2.0.0
 
 # Resource Limit flavor -By Default using small
 flavor: small
diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
index bf49157762..47b3312726 100644
--- a/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-inventory-api/templates/deployment.yaml
@@ -61,6 +61,8 @@ spec:
           args:
             - --container-name
             - {{ .Values.postgres.nameOverride }}
+            - --container-name
+            - aaf-cm
             - "-t"
             - "15"
           env: