1. Blueprint implementation.
2. Modify startup sequence.
Issue-ID: DCAEGEN2-2098
Signed-off-by: Kate Hsuan <kate.hsuan@qct.io>
Change-Id: I9d3d56565b0e997d3150eeef0891cc79bb0519ae
location ~/datalake/v1(.*)$ {
resolver 127.0.0.1 valid=10s;
- set $upstreamName http://dl_feeder:1680/datalake/v1$1;
+ set $upstreamName http://dl-feeder:1680/datalake/v1$1;
proxy_pass $upstreamName;
proxy_ssl_server_name on;
+++ /dev/null
-# ============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
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
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 }}"
+++ /dev/null
-# ============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
COPY target/${JAR_FILE} /home/datalake/
COPY src/assembly/run.sh /home/datalake/
+WORKDIR /home/datalake/db_init
+ADD src/assembly/init_db/scripts/db_init .
+USER root
+RUN chmod 0755 ./*
+WORKDIR /home/datalake
+COPY src/assembly/init_db/db_scripts/init_db.sql .
+COPY src/assembly/init_db/db_scripts/init_db_data.sql .
+
+RUN apt update && \
+ apt install -y mariadb-client && \
+ apt install -y curl
+
CMD ["sh", "run.sh"]
,'message-router-kafka:9092' -- host_port - IN varchar(255)
,'' -- included_topic - IN varchar(255)
,'admin' -- login - IN varchar(255)
- ,'admin-secret' -- pass - IN varchar(255)
+ ,'admin_secret' -- pass - IN varchar(255)
,0 -- secure - IN bit(1)
,'SASL_PLAINTEXT' -- security_protocol - IN varchar(255)
,10 -- timeout_sec - IN int(11)
exit 0
fi
-cat /app/init_db.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1
+cat /home/datalake/init_db.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1
exit 0
fi
-cat /app/init_db_data.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1
+cat /home/datalake/init_db_data.sql | mysql -uroot -p$MYSQL_ROOT_PASSWORD -h $MYSQL_HOST -P $MYSQL_PORT || exit 1
#!/bin/sh
-java -jar feeder-1.0.0-SNAPSHOT.jar
\ No newline at end of file
+echo "start init db ..."
+
+/bin/run-parts /home/datalake/db_init
+
+echo "finish init db"
+
+cmd=`ls feeder-*.jar`
+if [ -z "$cmd" ]; then
+ echo "STRING is empty"
+ sleep 10000
+else
+ java -jar $cmd
+fi
spring.jpa.show-sql=false
#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mariadb://dl-mariadb:3306/datalake?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+spring.datasource.url=jdbc:mariadb://mariadb-galera:3306/datalake?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
spring.datasource.username=dl
spring.datasource.password=dl1234
esTemplateMappingApi=/_template/
#####################Elasticsearch port
-esPort=9200
\ No newline at end of file
+esPort=9200
+++ /dev/null
-# ============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============================================
-
-FROM ubuntu:16.04 AS builder
-MAINTAINER Kate Hsuan <kate.hsuan@qct.io>
-
-LABEL org.label-schema.docker.build="docker build -t dl-db-init . --no-cache" \
- org.label-schema.docker.run="docker run dl-init"
-
-WORKDIR /app
-WORKDIR /app/db_init
-ADD scripts/db_init/ .
-RUN chmod 0755 ./*
-WORKDIR /app
-COPY scripts/run.sh .
-COPY db_scripts/init_db.sql .
-COPY db_scripts/init_db_data.sql .
-
-RUN chmod 0755 /app/run.sh
-
-ARG mysqlpasswd="0000"
-ENV MYSQL_ROOT_PASSWORD=$mysqlpasswd
-
-ARG mysqlhost="mariadb-galera"
-ENV MYSQL_HOST=$mysqlhost
-
-ARG mysqlport="3306"
-ENV MYSQL_PORT=${mysqlport}
-
-RUN apt update && \
- apt install -y mariadb-client-core-10.0 && \
- apt install -y curl
-
-CMD ["sh", "run.sh"]
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.dcaegen2.services.components</groupId>
- <artifactId>datalake-handler</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
- <artifactId>init_db</artifactId>
- <packaging>pom</packaging>
- <properties>
- <swagger.version>2.9.2</swagger.version>
- <dockerfile-maven.version>1.4.5</dockerfile-maven.version>
- <docker.image.path>onap/org.onap.dcaegen2.services.datalake.dbinit</docker.image.path>
- </properties>
- <name>DataLake db init</name>
- <build>
- <plugins>
-
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
- <configuration>
- <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
- <tag>${project.version}</tag>
- <dockerfile>Dockerfile</dockerfile>
- <noCache>true</noCache>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-</project>
Code Review / dcaegen2 / services.git / commitdiff