Merge "Commit pnf deletion to database in PMSH"
diff --git a/components/bbs-event-processor/pom.xml b/components/bbs-event-processor/pom.xml
index 36e2818..7d8c43f 100644
--- a/components/bbs-event-processor/pom.xml
+++ b/components/bbs-event-processor/pom.xml
@@ -231,10 +231,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8</version>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/components/datalake-handler/admin/Dockerfile b/components/datalake-handler/admin/Dockerfile
index 95af88a..38c50a6 100644
--- a/components/datalake-handler/admin/Dockerfile
+++ b/components/datalake-handler/admin/Dockerfile
@@ -11,13 +11,21 @@
npm run build
-FROM nginx:1.15.12
+FROM nginx:1.17.9
RUN apt-get update && \
- apt-get install -y dnsmasq
+ apt-get install -y dnsmasq
RUN echo "\n\n# Docker extra config \nuser=root\naddn-hosts=/etc/hosts\n" >> /etc/dnsmasq.conf
COPY --from=builder /app/dist/* /usr/share/nginx/html/
COPY --from=builder /app/dl-admin-nginx.conf /etc/nginx/conf.d/default.conf
-CMD service dnsmasq restart && nginx -g "daemon off;"
+CMD echo "domain-needed" >> /etc/dnsmasq.conf && \
+ echo "resolv-file=/etc/resolv.conf" >> /etc/dnsmasq.conf && \
+ echo "expand-hosts" >> /etc/dnsmasq.conf && \
+ echo "listen-address=127.0.0.1" >> /etc/dnsmasq.conf && \
+ service dnsmasq restart && \
+ echo set \$upstreamName http://dl-feeder.`grep search /etc/resolv.conf | awk {'print $2'}`:1680/datalake/v1\$1\$is_args\$args\; > /etc/nginx/upstream.conf && \
+ nginx -g "daemon off;"
+
+#CMD ["sh", "-c", "tail -f /dev/null"]
diff --git a/components/datalake-handler/admin/nginx/dl-admin-nginx.conf b/components/datalake-handler/admin/nginx/dl-admin-nginx.conf
index 9551a1d..b6caa60 100644
--- a/components/datalake-handler/admin/nginx/dl-admin-nginx.conf
+++ b/components/datalake-handler/admin/nginx/dl-admin-nginx.conf
@@ -2,9 +2,10 @@
listen 80;
root /usr/share/nginx/html;
+ resolver 127.0.0.1 valid=10s;
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;
+ include /etc/nginx/upstream.conf;
proxy_pass $upstreamName;
proxy_ssl_server_name on;
@@ -16,3 +17,4 @@
proxy_set_header X-Forwarded-Host $server_name;
}
}
+
diff --git a/components/datalake-handler/admin/pom.xml b/components/datalake-handler/admin/pom.xml
index 509d40a..5325ba9 100644
--- a/components/datalake-handler/admin/pom.xml
+++ b/components/datalake-handler/admin/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.components</groupId>
<artifactId>datalake-handler</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
@@ -17,6 +17,7 @@
<swagger.version>2.9.2</swagger.version>
<dockerfile-maven.version>1.4.5</dockerfile-maven.version>
<docker.image.path>onap/org.onap.dcaegen2.services.datalakeadminui</docker.image.path>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
</properties>
<name>DataLake Admin</name>
<build>
@@ -29,7 +30,55 @@
<repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
<tag>${project.version}</tag>
<dockerfile>Dockerfile</dockerfile>
- </configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-datalake-admin-ui-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-latest</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+ <tag>latest</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-with-version</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+ <tag>${project.version}</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-with-version-and-date</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+ <tag>${project.version}-${maven.build.timestamp}Z</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ </configuration>
+ </execution>
+ </executions>
<dependencies>
<dependency>
<groupId>javax.activation</groupId>
diff --git a/components/datalake-handler/collector/pom.xml b/components/datalake-handler/collector/pom.xml
index a7f40a6..a90b9df 100644
--- a/components/datalake-handler/collector/pom.xml
+++ b/components/datalake-handler/collector/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.components</groupId>
<artifactId>datalake-handler</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
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 a876229..2a839fa 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
@@ -44,12 +44,18 @@
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
- - name: HOSTNAME
- value: k8s-datalake
- - name: CONSUL_HOST
- value: consul
- - name: CONFIG_BINDING_SERVICE
- value: config-binding-service
+ - name: HOSTNAME
+ value: k8s-datalake
+ - name: CONSUL_HOST
+ value: consul
+ - name: CONFIG_BINDING_SERVICE
+ value: config-binding-service
+ - name: MYSQL_HOST
+ value: mariadb-galera
+ - name: MYSQL_PORT
+ value: "3306"
+ - name: MYSQL_ROOT_PASSWORD
+ value: secretpassword
ports:
- name: http
containerPort: 1680
diff --git a/components/datalake-handler/feeder/pom.xml b/components/datalake-handler/feeder/pom.xml
index f0be2a8..3297c7e 100644
--- a/components/datalake-handler/feeder/pom.xml
+++ b/components/datalake-handler/feeder/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.components</groupId>
<artifactId>datalake-handler</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
@@ -18,6 +18,8 @@
<swagger.version>2.9.2</swagger.version>
<dockerfile-maven.version>1.4.5</dockerfile-maven.version>
<docker.image.path>onap/org.onap.dcaegen2.services.datalakefeeder</docker.image.path>
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+
</properties>
<dependencies>
@@ -224,6 +226,54 @@
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
</configuration>
+ <executions>
+ <execution>
+ <id>build-sl-feeder-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-latest</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+ <tag>latest</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-with-version</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+ <tag>${project.version}</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-and-push-image-with-version-and-date</id>
+ <phase>package</phase>
+ <goals>
+ <goal>tag</goal>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+ <tag>${project.version}-${maven.build.timestamp}Z</tag>
+ <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+ </configuration>
+ </execution>
+ </executions>
<dependencies>
<!-- To make this work on JDK 9+ -->
<dependency>
diff --git a/components/datalake-handler/pom.xml b/components/datalake-handler/pom.xml
index d244806..9b00a41 100644
--- a/components/datalake-handler/pom.xml
+++ b/components/datalake-handler/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.onap.dcaegen2.services.components</groupId>
<artifactId>datalake-handler</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>dcaegen2-service-datalake-handler</name>
diff --git a/components/datalake-handler/version.properties b/components/datalake-handler/version.properties
index 2ddebb3..0f1f46a 100644
--- a/components/datalake-handler/version.properties
+++ b/components/datalake-handler/version.properties
@@ -1,6 +1,6 @@
major=1
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT
diff --git a/releases/datalake-adminui-1.0.0-container.yaml b/releases/datalake-adminui-1.0.0-container.yaml
new file mode 100755
index 0000000..77fe3b2
--- /dev/null
+++ b/releases/datalake-adminui-1.0.0-container.yaml
@@ -0,0 +1,9 @@
+distribution_type: 'container'
+version: '1.0.0'
+project: 'dcaegen2-services-datalake'
+log_dir: 'dcaegen2-services-datalake-handler-admin-ui-maven-docker-stage-master/22/'
+containers:
+ - name: 'org.onap.dcaegen2.services.datalakeadminui'
+ version: '1.0.0-20200313T023821Z'
+container_release_tag: '1.0.0'
+ref: '58bfd2b8e80ff7102f42cd7bbf1a1c0db6615e35'
diff --git a/releases/datalake-feeder-1.0.0-container.yaml b/releases/datalake-feeder-1.0.0-container.yaml
new file mode 100755
index 0000000..0834998
--- /dev/null
+++ b/releases/datalake-feeder-1.0.0-container.yaml
@@ -0,0 +1,9 @@
+distribution_type: 'container'
+version: '1.0.0'
+project: 'dcaegen2-services-datalake'
+log_dir: 'dcaegen2-services-datalake-handler-maven-docker-stage-master/64/'
+containers:
+ - name: 'org.onap.dcaegen2.services.datalakefeeder'
+ version: '1.0.0-20200313T182543Z'
+container_release_tag: '1.0.0'
+ref: 'e43d691ee2f2234a742266594fd34a7613a2f42c'