Commit 5b3ca287 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update deployment configurations.

parent c7e4d27c
Pipeline #15997 passed with stages
in 4 minutes and 54 seconds
jobName: ingest
processId: drupal
institutionId: drupal-sync
recordSetId: drupal-sync
# there will be no resources to load for now... (maybe logos some day)
appDirectory: drupal-sync
deploymentName: ip-drupal-sync-ingest
clientId: fedora-drupal-sync-ingest-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
fedoraConfigs: fedora-admin-credentials
\ No newline at end of file
fedoraConfigs: fedora-admin-credentials
inputTopicName: drupal-sync-output
outputTopicName: void_topic
reportingTopicName: import-process-reporting
deploymentName: ip-ingest-service
clientId: fedora-ingest-service-app
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
fedoraConfigs: fedora-admin-credentials
inputTopicName: import-process-normalization
outputTopicName: void_topic
reportingTopicName: import-process-reporting
......@@ -4,9 +4,7 @@ metadata:
name: "{{ .Values.deploymentName }}-config"
namespace: memobase
data:
APPLICATION_ID: {{ .Values.applicationId }}
CLIENT_ID: {{ .Values.clientId }}
TOPIC_IN: {{ .Values.inputTopicName }}
TOPIC_OUT: {{ .Values.outputTopicName }}
TOPIC_REPORTING: {{ .Values.reportingTopicName }}
APP_DIRECTORY: "some_value" # FIXME: Remove eventually?
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.deploymentName }}
name: {{ .Values.deploymentName }}-deployment
namespace: memobase
labels:
jobType: "import-process-deployment"
......
......@@ -4,24 +4,12 @@ image: "memoriav/memobase-2020/services/import-process/fedora-ingest-service"
tag: "latest"
deploymentName: fedora-ingest-service
## TODO: This needs to be solved differently. This way it is not possible to deploy a replica-set.
## somehow the id needs to be dependent on the pod name?
applicationId: fedora-ingest-service-app
clientId: fedora-ingest-service-app
institutionId: placeholder
recordSetId: placeholder
kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config
fedoraConfigs: fedora-admin-credentials
## Needs to be set to the directory on the sftp server.
## this is a relative path built like this:
## "./{RECORD_SET_ID}"
appDirectory: placeholderValue
inputTopicName: import-process-normalization
outputTopicName: void_topic
reportingTopicName: import-process-reporting
......@@ -19,13 +19,38 @@
package org.memobase
import com.beust.klaxon.Klaxon
import java.time.LocalDateTime
data class Report(
val id: String,
val status: String,
val message: String
val message: String,
val step: String = "fedora-ingest",
val timestamp: String = LocalDateTime.now().toString()
) {
fun toJson(): String {
return Klaxon().toJsonString(this)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as Report
if (id != other.id) return false
if (status != other.status) return false
if (message != other.message) return false
if (step != other.step) return false
return true
}
override fun hashCode(): Int {
var result = id.hashCode()
result = 31 * result + status.hashCode()
result = 31 * result + message.hashCode()
result = 31 * result + step.hashCode()
return result
}
}
......@@ -4,7 +4,6 @@ sftp:
user: ${SFTP_USER:?env}
password: ${SFTP_PASSWORD:?env}
app:
appDirectory: ${APP_DIRECTORY:?env}
fedora:
internalBaseUrl: ${FEDORA_INTERNAL_BASE_URL:?env}
externalBaseUrl: ${FEDORA_EXTERNAL_BASE_URL:?env}
......
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