Update DCAE container versions

- k8s-bootstrap-container => 1.4.1
- cm-container => 1.4.0
- change bootstrap from Job to Deployment

Change-Id: I57fb0aaba1f7ef6d361049b88e755075faeae00f
Issue-ID: DCAEGEN2-594
Signed-off-by: Jack Lucas <jflucas@research.att.com>

2 files changed, 99 insertions, 102 deletions

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
index cb499cfae0..801c132c79 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/deployment.yaml
@@ -1,99 +1,97 @@
-#============LICENSE_START========================================================
-# ================================================================================
-# Copyright (c) 2017-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=========================================================
-
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  completions: 1
-{{/*  backoffLimit: 0*/}}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
-    spec:
-      restartPolicy: Never
-      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
-          - dcae-cloudify-manager
-          - --container-name
-          - consul-server
-          - --container-name
-          - msb-discovery
-          - --container-name
-          - kube2msb
-          - "-t"
-          - "15"
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-      containers:
-        - name: {{ include "common.name" . }}
-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          volumeMounts:
-            - mountPath: /inputs
-              name: {{ include "common.fullname" . }}-dcae-inputs
-            - mountPath: /dcae-configs
-              name: {{ include "common.fullname" . }}-dcae-config
-            - mountPath: /etc/localtime
-              name: localtime
-              readOnly: true
-          env:
-            - name: CMADDR
-              value: {{ .Values.config.address.cm }}
-            - name: CMPASS
-              valueFrom:
-                secretKeyRef:
-                  name: {{ include "common.name" . }}-cmpass
-                  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:
-            name: {{ include "common.fullname" . }}-dcae-inputs
-        - name: {{ include "common.fullname" . }}-dcae-config
-          configMap:
-            name: {{ include "common.fullname" . }}-dcae-config
-        - name: localtime
-          hostPath:
-            path: /etc/localtime
-      imagePullSecrets:
-        - name: "{{ include "common.namespace" . }}-docker-registry-key"
+#============LICENSE_START========================================================

+# ================================================================================

+# Copyright (c) 2017-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=========================================================

+

+apiVersion: extensions/v1beta1

+kind: Deployment

+metadata:

+  name: {{ include "common.fullname" . }}

+  namespace: {{ include "common.namespace" . }}

+  labels:

+    app: {{ include "common.name" . }}

+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

+    release: {{ .Release.Name }}

+    heritage: {{ .Release.Service }}

+spec:

+  replicas: 1

+  template:

+    metadata:

+      labels:

+        app: {{ include "common.name" . }}

+        release: {{ .Release.Name }}

+    spec:

+      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

+          - dcae-cloudify-manager

+          - --container-name

+          - consul-server

+          - --container-name

+          - msb-discovery

+          - --container-name

+          - kube2msb

+          - "-t"

+          - "15"

+        env:

+        - name: NAMESPACE

+          valueFrom:

+            fieldRef:

+              apiVersion: v1

+              fieldPath: metadata.namespace

+      containers:

+        - name: {{ include "common.name" . }}

+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"

+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

+          volumeMounts:

+            - mountPath: /inputs

+              name: {{ include "common.fullname" . }}-dcae-inputs

+            - mountPath: /dcae-configs

+              name: {{ include "common.fullname" . }}-dcae-config

+            - mountPath: /etc/localtime

+              name: localtime

+              readOnly: true

+          env:

+            - name: CMADDR

+              value: {{ .Values.config.address.cm }}

+            - name: CMPASS

+              valueFrom:

+                secretKeyRef:

+                  name: {{ include "common.name" . }}-cmpass

+                  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:

+            name: {{ include "common.fullname" . }}-dcae-inputs

+        - name: {{ include "common.fullname" . }}-dcae-config

+          configMap:

+            name: {{ include "common.fullname" . }}-dcae-config

+        - name: localtime

+          hostPath:

+            path: /etc/localtime

+      imagePullSecrets:

+        - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index 76222bc827..bc430b4053 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -62,19 +62,18 @@ postgres:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.1.11
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.1
 
 # 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: onap/org.onap.dcaegen2.platform.configbinding:2.1.5
   deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:2.1.5
   holmes_engine: onap/holmes/engine-management:1.1.0
   holmes_rules: onap/holmes/rule-management:1.1.0
   inventory: onap/org.onap.dcaegen2.platform.inventory-api:3.0.1
   policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:2.4.5
-  service_change_handler: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.4
+  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