Commit 85bdbf88 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Add resource limits

Rename env to k8sEnvironment
parent dfb06732
Pipeline #32363 passed with stages
in 4 minutes and 5 seconds
......@@ -7,4 +7,4 @@ metadataLanguageLabels: prod-metadata-language-labels-csv
cantonLabels: prod-canton-labels-csv
municipalityLabels: prod-municipality-labels-csv
env: prod
\ No newline at end of file
k8sEnvironment: prod
\ No newline at end of file
......@@ -7,4 +7,4 @@ metadataLanguageLabels: stage-metadata-language-labels-csv
cantonLabels: stage-canton-labels-csv
municipalityLabels: stage-municipality-labels-csv
env: stage
\ No newline at end of file
k8sEnvironment: stage
\ No newline at end of file
......@@ -7,4 +7,4 @@ metadataLanguageLabels: test-metadata-language-labels-csv
cantonLabels: test-canton-labels-csv
municipalityLabels: test-municipality-labels-csv
env: test
k8sEnvironment: test
......@@ -9,17 +9,24 @@ spec:
selector:
matchLabels:
app: "{{ .Values.deploymentName }}-deployment"
replicas: 1
replicas: "{{ .Values.k8sReplicas }}"
template:
metadata:
labels:
app: "{{ .Values.deploymentName }}-deployment"
environment: {{ .Values.env }}
environment: {{ .Values.k8sEnvironment }}
spec:
containers:
- name: "{{ .Values.deploymentName }}-container"
image: "{{.Values.registry}}/{{ .Values.image }}:{{ .Values.tag }}"
imagePullPolicy: Always
resources:
requests:
cpu: "{{ .Values.k8sRequestsCpu }}"
memory: "{{ .Values.k8sRequestsMemory }}"
limits:
cpu: "{{ .Values.k8sLimitsCpu }}"
memory: "{{ .Values.k8sLimitsMemory }}"
envFrom:
- configMapRef:
name: "{{ .Values.kafkaConfigs }}"
......
......@@ -3,6 +3,13 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/drupal-sync-service"
tag: "latest"
k8sEnvironment: placeholder
k8sReplicas: 1
k8sRequestsCpu: "0.1"
k8sRequestsMemory: "128Mi"
k8sLimitsCpu: "0.5"
k8sLimitsMemory: "512Mi"
deploymentName: placeholder
inputTopic: placeholder
outputTopic: placeholder
......@@ -14,6 +21,4 @@ pathLanguageSource: /configs/languages/labels.csv
cantonLabels: placeholder
pathCantonLabels: /configs/cantons/labels.csv
municipalityLabels: placeholder
pathMunicipalityLabels: /configs/municipalities/labels.csv
env: placeholder
\ No newline at end of file
pathMunicipalityLabels: /configs/municipalities/labels.csv
\ No newline at end of file
......@@ -27,8 +27,8 @@ mbrs:testComplete a rico:RecordSet ;
rdau:P60099 "Französisch"@it , "Französisch"@fr , "Französisch"@de ;
rdau:P60451 mbcb:mrv ;
rdau:P60451 [ a rico:CorporateBody ;
schema:sameAs "http://memobase.ch/de/stock/detail/Tanzarchiv-121" ;
rico:title "Projektname (DE)"@de ;
schema:sameAs "http://example.org" ;
rico:title "Projektname (IT)"@it ;
rico:type "memoriavProject"
] ;
rdau:P60451 [ a rico:CorporateBody ;
......@@ -37,8 +37,8 @@ mbrs:testComplete a rico:RecordSet ;
rico:type "memoriavProject"
] ;
rdau:P60451 [ a rico:CorporateBody ;
schema:sameAs "http://example.org" ;
rico:title "Projektname (IT)"@it ;
schema:sameAs "http://memobase.ch/de/stock/detail/Tanzarchiv-121" ;
rico:title "Projektname (DE)"@de ;
rico:type "memoriavProject"
] ;
rdau:P60496 "<p>Zugang Memobase (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de , "<p>Zugang Memobase (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr , "<p>Zugang Memobase (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it ;
......@@ -58,31 +58,31 @@ mbrs:testComplete a rico:RecordSet ;
schema:sameAs "https://example.org"@de , "https://bestand.org"@fr , "https://example.org"@it ;
rico:title "Original Bestand (DE)"@de , "Original Bestand (FR)"@fr , "Original Bestand (IT)"@it
] ;
rico:hasTitle [ a rico:Title ;
rico:title "Originaltitle des Bestandes (DE)"@de , "Originaltitel des Bestandes"@fr , "Originaltitel des Bestandes (IT)"@it ;
rico:type "original"
] ;
rico:hasTitle [ a rico:Title ;
rico:title "Complete Record Set (DE)"@de , "Complete Record Set (FR)"@fr , "Complete Record Set (IT)"@it ;
rico:type "main"
] ;
rico:hasTitle [ a rico:Title ;
rico:title "Originaltitle des Bestandes (DE)"@de , "Originaltitel des Bestandes"@fr , "Originaltitel des Bestandes (IT)"@it ;
rico:type "original"
] ;
rico:heldBy "https://memobase.ch/institution/completeInstitution" ;
rico:history "<p>Kontext (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de , "<p>Kontext (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it , "<p>Kontext (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "Original-Signatur des Bestandes" ;
rico:type "callNumber"
rico:identifier "OLD_MEMOBASE_ID" ;
rico:type "oldMemobase"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "ORIGINAL_ID" ;
rico:type "original"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "testComplete" ;
rico:type "main"
rico:identifier "Original-Signatur des Bestandes" ;
rico:type "callNumber"
] ;
rico:identifiedBy [ a rico:Identifier ;
rico:identifier "OLD_MEMOBASE_ID" ;
rico:type "oldMemobase"
rico:identifier "testComplete" ;
rico:type "main"
] ;
rico:integrity "<div class=\"page-generator__output js-generator-output\">Auswahl (FR)</div>\r\n\r\n<div class=\"page-generator__output js-generator-output\">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>"@fr , "<p>Auswahl / Vollständigkeit (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de , "<div class=\"page-generator__output js-generator-output\">Auswahl/Vollständigkeit (IT)</div>\r\n\r\n<div class=\"page-generator__output js-generator-output\">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>"@it ;
rico:isAssociatedWithDate [ a rico:DateRange ;
......@@ -110,14 +110,14 @@ mbrs:testComplete a rico:RecordSet ;
] ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:RecordSet ;
schema:sameAs "https://example.org" ;
rico:title "Verwandte Bestände (FR)"@fr ;
schema:sameAs "http://example.com" ;
rico:title "Verwandter Bestand Extern (IT)"@it ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
[ a rico:RecordSet ;
schema:sameAs "http://example.com" ;
rico:title "Verwandter Bestand Extern (IT)"@it ;
schema:sameAs "https://example.org" ;
rico:title "Verwandte Bestände (FR)"@fr ;
rico:type "related"
] ;
rico:isRecordResourceAssociatedWithRecordResource
......@@ -128,20 +128,20 @@ mbrs:testComplete a rico:RecordSet ;
] ;
rico:isSubjectOf [ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Publikation (DE)"@de ;
rico:title "Publikation (IT)"@it ;
rico:type "publication"
] ;
rico:isSubjectOf [ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Publikation (IT)"@it ;
rico:title "Publikation (FR)"@fr ;
rico:type "publication"
] ;
rico:isSubjectOf [ a rico:Record ;
schema:sameAs "https://example.org/" ;
rico:title "Publikation (FR)"@fr ;
rico:title "Publikation (DE)"@de ;
rico:type "publication"
] ;
rico:modificationDate "2021-09-07T17:25:42.094"^^xsd:dateTime ;
rico:modificationDate "2021-09-13T10:05:33.884"^^xsd:dateTime ;
rico:publicationDate "2020-09-04"^^xsd:date ;
rico:recordResourceExtent "<p>Umfang (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it , "<p>Umfang (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr , "<p>Umfang (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de ;
rico:recordResourceOrInstantiationIsTargetOfRecordResourceHoldingRelation
......@@ -150,7 +150,7 @@ mbrs:testComplete a rico:RecordSet ;
"https://memobase.ch/institution/completeInstitution" ;
rico:recordResourceHoldingRelationHasTarget
mbrs:testComplete ;
rico:type "master"
rico:type "access"
] ;
rico:recordResourceOrInstantiationIsTargetOfRecordResourceHoldingRelation
[ a rico:RecordResourceHoldingRelation ;
......@@ -166,7 +166,7 @@ mbrs:testComplete a rico:RecordSet ;
"https://memobase.ch/institution/completeInstitution" ;
rico:recordResourceHoldingRelationHasTarget
mbrs:testComplete ;
rico:type "access"
rico:type "master"
] ;
rico:scopeAndContent "<p>Inhalt (FR)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@fr , "<p>Inhalt (IT)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@it , "<p>Inhalt (DE)</p>\r\n\r\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>"@de ;
rico:title "Complete Record Set (DE)"@de , "Complete Record Set (IT)"@it , "Complete Record Set (FR)"@fr .
Markdown is supported
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