Commit 366536f5 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Fix deployment

- Update bintray download path
- Rename helm chart folder.
parent 179876d7
Pipeline #11449 failed with stages
in 1 minute and 43 seconds
...@@ -65,7 +65,7 @@ test-chart: ...@@ -65,7 +65,7 @@ test-chart:
tags: tags:
- mbr - mbr
script: script:
- helm lint chart/ - helm lint helm-charts//
publish-chart: publish-chart:
stage: publish stage: publish
...@@ -76,7 +76,7 @@ publish-chart: ...@@ -76,7 +76,7 @@ publish-chart:
- export HELM_EXPERIMENTAL_OCI=1 - export HELM_EXPERIMENTAL_OCI=1
- helm registry login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY" - helm registry login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- ./insert_chart_versions.sh - ./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 chart push "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
- helm registry logout "$CI_REGISTRY" - helm registry logout "$CI_REGISTRY"
only: only:
......
...@@ -22,7 +22,7 @@ targetCompatibility = 1.8 ...@@ -22,7 +22,7 @@ targetCompatibility = 1.8
repositories { repositories {
jcenter() jcenter()
maven { maven {
url "https://dl.bintray.com/jonas-waeber/memobase" url "https://dl.bintray.com/memoriav/memobase"
} }
} }
......
#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
apiVersion: v2 apiVersion: v2
name: search-doc-service name: drupal-sync-service
description: This service transforms input rdf data into a search document for elasticsearch. description: This service transforms drupal json api output into RDF Resources.
type: application type: application
version: 0.0.0 version: 0.0.0
appVersion: 0.0.0 appVersion: 0.0.0
......
...@@ -14,7 +14,7 @@ spec: ...@@ -14,7 +14,7 @@ spec:
metadata: metadata:
labels: labels:
app: "{{ .Values.deploymentName }}-deployment" app: "{{ .Values.deploymentName }}-deployment"
tier: post-processing tier: import-process
spec: spec:
containers: containers:
- name: "{{ .Values.deploymentName }}-container" - name: "{{ .Values.deploymentName }}-container"
...@@ -25,11 +25,4 @@ spec: ...@@ -25,11 +25,4 @@ spec:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.deploymentName}}-app-config" name: "{{ .Values.deploymentName}}-app-config"
volumeMounts:
- name: config-volume
mountPath: "/configs/mappings/"
volumes:
- name: config-volume
configMap:
name: "{{ .Values.configMapName }}"
restartPolicy: Always restartPolicy: Always
#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
#!/usr/bin/env bash #!/usr/bin/env bash
echo Creating release: $1 echo Creating release: $1
sed -i "s/version: 0.0.0/version: $CI_COMMIT_TAG/g" ./chart/Chart.yaml 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" ./chart/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" ./chart/values.yaml sed -i "s/tag: \"latest\"/tag: $CI_COMMIT_TAG/g" ./helm-charts//values.yaml
\ No newline at end of file \ No newline at end of file
...@@ -1517,7 +1517,7 @@ http://www.wikidata.org/entity/Q69135 6473 http://www.wikidata.org/entity/Q12404 ...@@ -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/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/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/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/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/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) 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 ...@@ -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/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/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/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/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/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) http://www.wikidata.org/entity/Q69367 8194 http://www.wikidata.org/entity/Q11943 Point(8.49845 47.5919),Point(8.493888888 47.596111111)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment