Fixes/kubernetes

.editorconfig

@@ -31,6 +31,6 @@ indent_style = space
 indent_size = 2
 
 # 2 spaces for md, yaml, ttl, etc..
-[*.{md,yml,iml,json,ttl,ts,js,html,css}]
+[*.{md,yml,iml,json,ttl,ts,js,html,css,yaml}]
 indent_style = space
 indent_size = 2

Makefile

@@ -109,3 +109,39 @@ lc-run:
 dev:
 	docker-compose -f docker-compose-dev.yml build
 	docker-compose -f docker-compose-dev.yml -f docker-compose.override.yml up
+
+#kubernetes configurations
+#-
+create-cluster:
+	sudo kubeadm init --pod-network-cidr=192.168.0.0/16
+
+configure-kubectl:
+	mkdir -p $HOME/.kube
+	sudo cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
+	sudo chown $(id -u):$(id -g) $HOME/.kube/config
+
+schedule-on-master:
+	kubectl taint nodes --all node-role.kubernetes.io/master-
+
+start-cni:
+	kubectl apply -f ./resource/calico.yaml && kubectl apply -f - <resource/calicoctl.yaml && alias calicoctl="kubectl exec -i -n kube-system calicoctl /calicoctl -- "
+
+create-ippool:
+	calicoctl apply -f ./resource/pools.yaml
+
+create-namespace:
+	kubectl create -f ./resource/namespaces.yaml
+
+assign-to-ippool:
+	kubectl annotate namespace hobbit "cni.projectcalico.org/ipv4pools"='[“hobbit"]'
+	kubectl annotate namespace hobbit-core "cni.projectcalico.org/ipv4pools"='[“hobbit-core"]'
+	kubectl annotate namespace hobbit-service "cni.projectcalico.org/ipv4pools"='[“hobbit-service"]'
+
+start-platform:
+	kubectl apply -f ./resource/kompose
+
+start-dev-platform:
+	kubectl apply -f ./resource/kompose-dev
+
+start-elk-platform:
+	kubectl apply -f ./resource/kompose-elk

analysis-component/analysis-component.iml

@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.aksw:palmetto:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch:hppc:0.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.lucene:lucene-analyzers-common:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.10" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.6.5" level="project" />
     <orderEntry type="library" name="Maven: nz.ac.waikato.cms.weka:weka-stable:3.8.0" level="project" />
     <orderEntry type="library" name="Maven: nz.ac.waikato.cms.weka.thirdparty:java-cup-11b:2015.03.26" level="project" />
     <orderEntry type="library" name="Maven: nz.ac.waikato.cms.weka.thirdparty:java-cup-11b-runtime:2015.03.26" level="project" />
@@ -33,35 +42,43 @@
     <orderEntry type="library" name="Maven: net.sourceforge.f2j:arpack_combined_all:0.1" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.netlib-java:netlib-java:1.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.fommil.netlib:core:1.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" name="Maven: org.hobbit:core:1.0.8-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
+    <orderEntry type="library" name="Maven: org.hobbit:core:1.0.18" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-shaded-guava:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-arq:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.6" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsonld-java:jsonld-java:0.11.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient-cache:4.5.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.thrift:libthrift:0.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.15" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.15" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.6.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.jena:jena-core:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.jena:jena-iri:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:4.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-core:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-iri:3.6.0" level="project" />
     <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
     <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
-    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.jena:jena-base:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.jena:jena-shaded-guava:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:collection:0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.jena:jena-tdb:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.jena:jena-arq:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.5" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsonld-java:jsonld-java:0.7.0" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient-cache:4.2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.thrift:libthrift:0.9.2" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.20" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-base:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-csv:1.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.andrewoma.dexx:collection:0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-tdb:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-tdb2:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-dboe-trans-data:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-dboe-transaction:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-dboe-base:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-dboe-index:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.jena:jena-rdfconnection:3.6.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.10" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.github.stefanbirkner:system-rules:1.17.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.10" level="project" />
   </component>
-</module>
+</module>

parent-pom/pom.xml

@@ -3,7 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.hobbit</groupId>
     <artifactId>parent</artifactId>
-    <version>${hobbitplatform.version}</version>
+    <!-- <version>${hobbitplatform.version}</version> -->
+    <version>2.0.5</version>
     <packaging>pom</packaging>
 
     <!-- PROPERTIES -->

platform-controller/Dockerfile

@@ -1,5 +1,9 @@
 FROM maven
 
+LABEL maintainer="Hobbit Team" \
+      name="platform-controller" \
+      version="0.1"
+
 RUN mkdir -p /usr/src/app
 # Create an empty metadata directory (it will be used as default by the file-based image manager)
 RUN mkdir -p /usr/src/app/metadata