Commit 6f446ff9 authored by Thomas Bernhart's avatar Thomas Bernhart
Browse files

Merge branch 'update-deployment' into 'master'

Update helm-charts and values

See merge request !13
parents faacad78 07924432
Pipeline #24844 passed with stages
in 3 minutes and 52 seconds
...@@ -20,10 +20,9 @@ sourceCompatibility = 1.8 ...@@ -20,10 +20,9 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
repositories { repositories {
jcenter()
mavenCentral() mavenCentral()
maven { maven {
url "https://dl.bintray.com/memoriav/memobase" url "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
} }
} }
...@@ -36,7 +35,7 @@ dependencies { ...@@ -36,7 +35,7 @@ dependencies {
def excludeSlf4J = { exclude group: 'org.slf4j' } def excludeSlf4J = { exclude group: 'org.slf4j' }
// JSON Parser // JSON Parser
implementation 'com.beust:klaxon:5.2' implementation 'com.beust:klaxon:5.5'
implementation "org.apache.logging.log4j:log4j-api:${log4jV}" implementation "org.apache.logging.log4j:log4j-api:${log4jV}"
implementation "org.apache.logging.log4j:log4j-core:${log4jV}" implementation "org.apache.logging.log4j:log4j-core:${log4jV}"
...@@ -46,8 +45,8 @@ dependencies { ...@@ -46,8 +45,8 @@ dependencies {
implementation 'org.apache.jena:apache-jena:3.14.0', excludeSlf4J implementation 'org.apache.jena:apache-jena:3.14.0', excludeSlf4J
implementation 'org.memobase:memobase-service-utilities:2.0.2', excludeSlf4J implementation 'org.memobase:memobase-service-utilities:3.0.1', excludeSlf4J
implementation 'ch.memobase:fedora-client:0.7.0', excludeSlf4J implementation 'ch.memobase:fedora-client:0.8.0', excludeSlf4J
// KOTLIN IMPORTS // KOTLIN IMPORTS
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
......
apiVersion: v2 apiVersion: v2
name: fedora-ingest-service name: fedora-ingest-service
description: A helm chart for the fedora-ingest-service service. description: A helm chart for the fedora-ingest-service service
type: application type: application
version: 0.0.0 version: 0.0.0
appVersion: 0.0.0 appVersion: 0.0.0
maintainers: maintainers:
- name: Thomas Bernhart - name: Thomas Bernhart
email: t.bernhart@docuteam.ch email: t.bernhart@docuteam.ch
\ No newline at end of file
deploymentName: ip-ingest-service deploymentName: di-fedora-indexer-prod
clientId: fedora-ingest-service-app
k8sName: fedora-indexer
k8sNamespace: memobase
k8sGroupId: di
k8sGroupName: documents-import
k8sEnvironment: prod
k8sReplicas: 1
k8sRequestsCpu: "0.2"
k8sRequestsMemory: "0.2Gi"
k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config sftpConfigs: internal-sftp-config
fedoraConfigs: fedora-admin-credentials fedoraConfigs: fedora-admin-credentials
isSimple: false isSimple: false
inputTopicName: import-process-ingest inputTopicName: mb-di-ingest-prod
outputTopicName: void_topic outputTopicName: void_topic
reportingTopicName: import-process-reporting reportingTopicName: mb-di-reporting-prod
clientId: prod-di-fedora-indexer
\ No newline at end of file
deploymentName: dp-sync-ingest deploymentName: gi-fedora-indexer-prod
clientId: fedora-drupal-sync-ingest-app
k8sName: fedora-indexer
k8sNamespace: memobase
k8sGroupId: gi
k8sGroupName: group-import
k8sEnvironment: prod
k8sReplicas: 1
k8sRequestsCpu: "0.2"
k8sRequestsMemory: "0.2Gi"
k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config sftpConfigs: internal-sftp-config
fedoraConfigs: fedora-admin-credentials fedoraConfigs: fedora-admin-credentials
isSimple: true isSimple: true
inputTopicName: drupal-sync-output inputTopicName: mb-gi-rdf-objects-prod
outputTopicName: void_topic outputTopicName: void_topic
reportingTopicName: import-process-reporting reportingTopicName: mb-di-reporting-prod
clientId: prod-gi-fedora-indexer
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: "{{ .Values.deploymentName }}-config" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-config"
namespace: memobase namespace: "{{ .Values.k8sNamespace }}"
data: data:
CLIENT_ID: {{ .Values.clientId }} CLIENT_ID: {{ .Values.clientId }}
IS_SIMPLE: "{{ .Values.isSimple }}" IS_SIMPLE: "{{ .Values.isSimple }}"
TOPIC_IN: {{ .Values.inputTopicName }} TOPIC_IN: {{ .Values.inputTopicName }}
TOPIC_OUT: {{ .Values.outputTopicName }} TOPIC_OUT: {{ .Values.outputTopicName }}
TOPIC_REPORTING: {{ .Values.reportingTopicName }} TOPIC_REPORTING: {{ .Values.reportingTopicName }}
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ .Values.deploymentName }}-deployment name: {{ .Values.deploymentName }}
namespace: memobase namespace: memobase
labels: labels:
jobType: "import-process-deployment" app: {{ .Values.deploymentName }}-app
spec: spec:
selector: selector:
matchLabels: matchLabels:
app: {{ .Values.deploymentName }} app: {{ .Values.deploymentName }}-app
replicas: 1 replicas: 1
template: template:
metadata: metadata:
labels: labels:
app: {{ .Values.deploymentName }} app: {{ .Values.deploymentName }}-app
tier: import-process tier: import-process #FIXME: web?
spec: spec:
restartPolicy: Always
containers: containers:
- name: "{{ .Values.deploymentName }}-container" - name: "{{ .Values.deploymentName }}-container"
image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}" image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
imagePullPolicy: Always imagePullPolicy: Always
resources: resources:
requests: requests:
cpu: "0.5" cpu: "0.5"
memory: "128Mi" memory: "128Mi"
limits: limits:
cpu: "1" cpu: "1"
memory: "1Gi" memory: "1Gi"
envFrom: envFrom:
- secretRef: - secretRef:
name: "{{ .Values.sftpConfigs }}" name: "{{ .Values.sftpConfigs }}"
- secretRef: - secretRef:
name: "{{ .Values.fedoraConfigs }}" name: "{{ .Values.fedoraConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.deploymentName }}-config" name: "{{ .Values.deploymentName }}-config"
restartPolicy: Always
...@@ -3,14 +3,15 @@ registry: "cr.gitlab.switch.ch" ...@@ -3,14 +3,15 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/fedora-ingest-service" image: "memoriav/memobase-2020/services/import-process/fedora-ingest-service"
tag: "latest" tag: "latest"
deploymentName: fedora-ingest-service deploymentName: placeholder
clientId: fedora-ingest-service-app
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: placeholder
sftpConfigs: internal-sftp-config sftpConfigs: placeholder
fedoraConfigs: fedora-admin-credentials fedoraConfigs: placeholder
isSimple: true isSimple: placeholder
inputTopicName: import-process-normalization inputTopicName: placeholder
outputTopicName: void_topic outputTopicName: placeholder
reportingTopicName: import-process-reporting reportingTopicName: placeholder
clientId: placeholder
\ No newline at end of file
...@@ -39,8 +39,7 @@ class Service(fileName: String = "app.yml") : Closeable { ...@@ -39,8 +39,7 @@ class Service(fileName: String = "app.yml") : Closeable {
companion object { companion object {
const val FEDORA_PROPERTIES_PREFIX = "fedora" const val FEDORA_PROPERTIES_PREFIX = "fedora"
const val CONSUMER_MAX_POLL_RECORDS = "10" const val CONSUMER_MAX_POLL_RECORDS = "10"
const val CONSUMER_MAX_INTERVAL_MS = "600000" // 600000ms = 10min const val CONSUMER_MAX_INTERVAL_MS = "600000" // 600000ms = 10min
const val BINARY_FILE_URI_PATH = "binary" const val BINARY_FILE_URI_PATH = "binary"
const val SFTP_PREFIX = "sftp:" const val SFTP_PREFIX = "sftp:"
......
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