Switch from cloudify helm plugin to cloudify/tosca.

1. Blueprint implementation.
2. Modify startup sequence.

Issue-ID: DCAEGEN2-2098
Signed-off-by: Kate Hsuan <kate.hsuan@qct.io>
Change-Id: I9d3d56565b0e997d3150eeef0891cc79bb0519ae

21 files changed, 1 insertions, 97 deletions

diff --git a/components/datalake-handler/dpo/blueprint/k8s-datalake-helm-input.yaml b/components/datalake-handler/dpo/blueprint/k8s-datalake-helm-input.yaml
deleted file mode 100644
index c343f9c7..00000000
--- a/components/datalake-handler/dpo/blueprint/k8s-datalake-helm-input.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# ============LICENSE_START==========================================
-# ===================================================================
-# Copyright (c) 2020 QCT
-#
-# 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============================================
-
-tiller-server-ip: 10.103.11.87
-tiller-server-port: 31867
-namespace: onap
-chart-repo-url: http://10.103.11.87:8879/charts
-stable-repo-url: http://127.0.0.1:8879
-chart-version: 1.0.0
-component-name: dcae-datalake
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/Chart.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/Chart.yaml
index bdb3cff8..bdb3cff8 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/Chart.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/Chart.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml
index a93facc7..a93facc7 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/Chart.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt
index 6f315f55..6f315f55 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/NOTES.txt
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl
index e383ea4b..e383ea4b 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/_helpers.tpl
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml
index b57acbee..b57acbee 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/deployment.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml
index d8167407..d8167407 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/ingress.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml
index 3934e419..3934e419 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/templates/service.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml
index a47e7d0a..cb6b7be8 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-admin-ui/values.yaml
@@ -22,7 +22,7 @@
 replicaCount: 1
 
 image:
-  repository: nexus3.onap.org:10001/v2/onap/org.onap.dcaegen2.services.datalakeadminui
+  repository: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakeadminui 
   tag: 1.0.0
   pullPolicy: IfNotPresent
 
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml
index abc42752..abc42752 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/Chart.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties
index 6d3f3d21..6d3f3d21 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/resources/config/overrides/application.properties
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt
index 4e97715e..4e97715e 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/NOTES.txt
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl
index 272853ea..272853ea 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/_helpers.tpl
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml
index f7aca237..f7aca237 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/configmap.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml
index 4c9dffcd..a8762291 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/deployment.yaml
@@ -39,21 +39,6 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-      initContainers:
-      - command:
-        - /root/job_complete.py
-        args:
-        - -j
-        - {{ .Release.Name }}-dcae-datalake-feeder-dbinit-job
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        name: datalake-readiness
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml
index af724c12..af724c12 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/ingress.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml
index 918f0bc8..918f0bc8 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/service.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml
index 32043b43..32043b43 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/templates/serviceCusterIP.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml
index acec4640..acec4640 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/charts/dcae-datalake-feeder/values.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/values.yaml b/components/datalake-handler/dpo/helm-chart/dcae-datalake/values.yaml
index b31a5d01..b31a5d01 100644
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/values.yaml
+++ b/components/datalake-handler/dpo/helm-chart/dcae-datalake/values.yaml
diff --git a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/job.yaml b/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/job.yaml
deleted file mode 100644
index a990fb75..00000000
--- a/components/datalake-handler/dpo/helm_chart/dcae-datalake/charts/dcae-datalake-feeder/templates/job.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# ============LICENSE_START==========================================
-# ===================================================================
-#  Copyright (c) 2020 QCT
-#
-#  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 "dcae-datalake-feeder.fullname" . }}-dbinit-job
-  labels:
-{{ include "dcae-datalake-feeder.labels" . | indent 4 }}
-spec:
-  template:
-    spec:
-      #initContainers:
-      #- name: datalake-readiness
-        #command:
-        #- /root/ready.py
-        #args:
-        #- --container-name
-        #- {{ .Values.config.mariadbGalera.chartName }}
-        #env:
-        #- name: NAMESPACE
-        #  valueFrom:
-        #    fieldRef:
-        #      apiVersion: v1
-        #      fieldPath: metadata.namespace
-        #image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
-        #imagePullPolicy: Always
-
-      containers:
-      - name: datalake-db-init
-        image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalake.dbinit:1.0.0
-        env:
-        - name: MYSQL_HOST
-          value: "{{ .Values.config.mariadbGalera.serviceName }}"
-        - name: MYSQL_PORT
-          value: "3306"
-        - name: MYSQL_ROOT_PASSWORD
-          value: "secretpassword"
-        - name: PRESTO_HOST
-          value: "{{ .Values.config.presto.serviceName }}"
-        command: ["sh",  "run.sh"]
-      restartPolicy: Never
-  backoffLimit: 4