Fix deployment

- Update bintray download path
- Rename helm chart folder.

.gitlab-ci.yml

@@ -65,7 +65,7 @@ test-chart:
   tags:
     - mbr
   script:
-    - helm lint chart/
+    - helm lint helm-charts//
 
 publish-chart:
   stage: publish
@@ -76,7 +76,7 @@ publish-chart:
     - export HELM_EXPERIMENTAL_OCI=1
     - helm registry login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
     - ./insert_chart_versions.sh
-    - helm chart save chart/ "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
+    - helm chart save helm-charts// "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
     - helm chart push "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
     - helm registry logout "$CI_REGISTRY"
   only:

build.gradle

@@ -22,7 +22,7 @@ targetCompatibility = 1.8
 repositories {
     jcenter()
     maven {
-        url  "https://dl.bintray.com/jonas-waeber/memobase"
+        url  "https://dl.bintray.com/memoriav/memobase"
     }
 }
 

chart/values.yaml

-#image values
-registry: "cr.gitlab.switch.ch"
-image: "memoriav/memobase-2020/services/elastic-services/search-doc-service"
-tag: "latest"
-
-deploymentName: search-doc-service
-configMapName: search-doc-mapping-config
-kafkaConfigs: prod-kafka-bootstrap-servers
\ No newline at end of file

chart/Chart.yaml → helm-charts/Chart.yaml

 apiVersion: v2
-name: search-doc-service
-description: This service transforms input rdf data into a search document for elasticsearch.
+name: drupal-sync-service
+description: This service transforms drupal json api output into RDF Resources.
 type: application
 version: 0.0.0
 appVersion: 0.0.0

chart/templates/deployment.yaml → helm-charts/templates/deployment.yaml

@@ -14,7 +14,7 @@ spec:
     metadata:
       labels:
         app: "{{ .Values.deploymentName }}-deployment"
-        tier: post-processing
+        tier: import-process
     spec:
       containers:
         - name: "{{ .Values.deploymentName }}-container"
@@ -25,11 +25,4 @@ spec:
               name: "{{ .Values.kafkaConfigs }}"
           - configMapRef:
               name: "{{ .Values.deploymentName}}-app-config"
-          volumeMounts:
-            - name: config-volume
-              mountPath: "/configs/mappings/"
-      volumes:
-        - name: config-volume
-          configMap:
-            name: "{{ .Values.configMapName }}"
       restartPolicy: Always

helm-charts/values.yaml

+#image values
+registry: "cr.gitlab.switch.ch"
+image: "memoriav/memobase-2020/services/import-process/drupal-sync-service"
+tag: "latest"
+
+deploymentName: drupal-sync
+inputTopic:
+kafkaConfigs: prod-kafka-bootstrap-servers
\ No newline at end of file

insert_chart_versions.sh

 #!/usr/bin/env bash
 
 echo Creating release: $1
-sed -i "s/version: 0.0.0/version: $CI_COMMIT_TAG/g" ./chart/Chart.yaml
-sed -i "s/appVersion: 0.0.0/appVersion: $CI_COMMIT_TAG/g" ./chart/Chart.yaml
-sed -i "s/tag: \"latest\"/tag: $CI_COMMIT_TAG/g" ./chart/values.yaml
\ No newline at end of file
+sed -i "s/version: 0.0.0/version: $CI_COMMIT_TAG/g" ./helm-charts/Chart.yaml
+sed -i "s/appVersion: 0.0.0/appVersion: $CI_COMMIT_TAG/g" ./helm-charts//Chart.yaml
+sed -i "s/tag: \"latest\"/tag: $CI_COMMIT_TAG/g" ./helm-charts//values.yaml
\ No newline at end of file

src/main/resources/municipalities.tsv

@@ -1517,7 +1517,7 @@ http://www.wikidata.org/entity/Q69135	6473	http://www.wikidata.org/entity/Q12404
 http://www.wikidata.org/entity/Q69140	6375	http://www.wikidata.org/entity/Q12592	Point(8.4747 46.9665)
 http://www.wikidata.org/entity/Q69143	4552	http://www.wikidata.org/entity/Q11929	Point(7.5899 47.19185),Point(7.5825 47.200833333)
 http://www.wikidata.org/entity/Q69148	8952	http://www.wikidata.org/entity/Q11943	Point(8.449722222 47.398888888),Point(8.44884 47.39499)
-http://www.wikidata.org/entity/Q69152	8240	http://www.wikidata.org/entity/Q12697	Point(8.699722222 47.733055555),Point(8.69055 47.75863)
+http://www.wikidata.org/entity/Q69152	8240	http://www.wikidata.org/entity/Q12697	Point(8.69055 47.75863),Point(8.699722222 47.733055555)
 http://www.wikidata.org/entity/Q69156	8233	http://www.wikidata.org/entity/Q12697	Point(8.59191 47.7934),Point(8.599722222 47.783333333)
 http://www.wikidata.org/entity/Q69160	3065	http://www.wikidata.org/entity/Q11911	Point(7.51363 46.98316),Point(7.498611111 46.976111111)
 http://www.wikidata.org/entity/Q69164	8217	http://www.wikidata.org/entity/Q12697	Point(8.466666666 47.666388888)
@@ -1574,7 +1574,7 @@ http://www.wikidata.org/entity/Q69333	1261	http://www.wikidata.org/entity/Q12771
 http://www.wikidata.org/entity/Q69335	1264	http://www.wikidata.org/entity/Q12771	Point(6.15 46.45),Point(6.12732 46.45148)
 http://www.wikidata.org/entity/Q69337	1276	http://www.wikidata.org/entity/Q12771	Point(6.183333333 46.416666666),Point(6.13813 46.42623)
 http://www.wikidata.org/entity/Q69345	2000	http://www.wikidata.org/entity/Q12738	Point(6.930555555 46.990277777)
-http://www.wikidata.org/entity/Q69354	1816,1815,1822,1832,1820,1823,1833,1824,1818,1817	http://www.wikidata.org/entity/Q12771	Point(6.916666666 46.433333333)
+http://www.wikidata.org/entity/Q69354	1833,1824,1818,1817,1816,1815,1822,1832,1820,1823	http://www.wikidata.org/entity/Q12771	Point(6.916666666 46.433333333)
 http://www.wikidata.org/entity/Q69358	7563	http://www.wikidata.org/entity/Q11925	Point(10.36647 46.95222),Point(10.35 46.933333333)
 http://www.wikidata.org/entity/Q69364	1227	http://www.wikidata.org/entity/Q11917	Point(6.14037 46.18166)
 http://www.wikidata.org/entity/Q69367	8194	http://www.wikidata.org/entity/Q11943	Point(8.49845 47.5919),Point(8.493888888 47.596111111)