Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
memoriav
Memobase 2020
services
Import Process
Table Data Transform
Commits
343f5b92
Commit
343f5b92
authored
Sep 25, 2020
by
Matthias
Browse files
adapt helm charts to new workflow
parent
a9c86993
Pipeline
#14783
failed with stages
in 2 minutes and 42 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
helm-charts/templates/app-config.yaml
View file @
343f5b92
apiVersion
:
v1
apiVersion
:
v1
kind
:
ConfigMap
kind
:
ConfigMap
metadata
:
metadata
:
name
:
"
{{
.Values.
processId
}}-{{
.Values.job
Name
}}-config"
name
:
"
{{
.Values.
deployment
Name
}}-config"
namespace
:
memobase
namespace
:
memobase
data
:
data
:
APPLICATION_ID
:
"
{{
.Values.processId
}}-{{
.Values.jobName
}}"
APPLICATION_ID
:
{{
.Values.applicationId
}}
SHEET_INDEX
:
"
{{
.Values.sheetIndex
}}"
TOPIC_IN
:
{{
.Values.inputTopicName
}}
HEADER_COUNT
:
"
{{
.Values.headerCount
}}"
TOPIC_OUT
:
{{
.Values.outputTopicName
}}
HEADER_LINE_INDEX
:
"
{{
.Values.headerLineIndex
}}"
TOPIC_PROCESS
:
{{
.Values.reportingTopicName
}}
IDENTIFIER_INDEX
:
"
{{
.Values.identifierIndex
}}"
\ No newline at end of file
TOPIC_IN
:
"
{{
.Values.processId
}}-{{
.Values.lastJobName
}}"
TOPIC_OUT
:
"
{{
.Values.processId
}}-{{
.Values.jobName
}}"
TOPIC_PROCESS
:
"
{{
.Values.processId
}}-reporting"
\ No newline at end of file
helm-charts/templates/
job
.yaml
→
helm-charts/templates/
deployment
.yaml
View file @
343f5b92
apiVersion
:
batch
/v1
apiVersion
:
apps
/v1
kind
:
Job
kind
:
Deployment
metadata
:
metadata
:
name
:
"
{{
.Values.
processId
}}-{{
.Values.job
Name
}}
"
name
:
{{
.Values.
deployment
Name
}}
namespace
:
memobase
namespace
:
memobase
labels
:
labels
:
institutionId
:
"
{{
.Values.institutionId
}}"
jobType
:
"
import-process-deployment"
recordSetId
:
"
{{
.Values.recordSetId
}}"
jobType
:
"
import-job"
spec
:
spec
:
selector
:
matchLabels
:
app
:
{{
.Values.deploymentName
}}
replicas
:
1
template
:
template
:
metadata
:
labels
:
app
:
{{
.Values.deploymentName
}}
tier
:
import-process
spec
:
spec
:
restartPolicy
:
Always
containers
:
containers
:
-
name
:
"
{{
.Values.processId
}}-{{
.Values.jobName
}}"
-
name
:
"
{{
.Values.processId
}}-{{
.Values.jobName
}}"
image
:
"
{{
.Values.registry
}}/{{
.Values.image
}}:{{
.Values.tag
}}"
image
:
"
{{
.Values.registry
}}/{{
.Values.image
}}:{{
.Values.tag
}}"
...
@@ -18,7 +25,5 @@ spec:
...
@@ -18,7 +25,5 @@ spec:
name
:
"
{{
.Values.sftpConfigs
}}"
name
:
"
{{
.Values.sftpConfigs
}}"
-
configMapRef
:
-
configMapRef
:
name
:
"
{{
.Values.kafkaConfigs
}}"
name
:
"
{{
.Values.kafkaConfigs
}}"
-
configMapRef
:
name
:
"
{{
.Values.processId
}}-{{
.Values.jobName
}}-config"
restartPolicy
:
Never
backoffLimit
:
0
backoffLimit
:
0
name
:
"
{{
.Values.deploymentName
}}-config"
\ No newline at end of file
helm-charts/values.yaml
View file @
343f5b92
...
@@ -7,22 +7,17 @@ registry: "cr.gitlab.switch.ch"
...
@@ -7,22 +7,17 @@ registry: "cr.gitlab.switch.ch"
image
:
"
memoriav/memobase-2020/services/import-process/table-data-transform"
image
:
"
memoriav/memobase-2020/services/import-process/table-data-transform"
tag
:
"
latest"
tag
:
"
latest"
deploymentName
:
table-data-transform
## 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
:
table-data-transform-app
kafkaConfigs
:
prod-kafka-bootstrap-servers
kafkaConfigs
:
prod-kafka-bootstrap-servers
sftpConfigs
:
internal-sftp-config
sftpConfigs
:
internal-sftp-config
lastJobName
:
text-file-validation
inputTopicName
:
import-process-data-transform
outputTopicName
:
import-process-mapper
reportingTopicName
:
import-process-reporting
############################################
## Values below should be defined via the #
## User Interface (Drupal) #
############################################
jobName
:
table-data-transform
processId
:
p0001
institutionId
:
placeholder
recordSetId
:
placeholder
# DEFAULT APP CONFIG VALUES
# DEFAULT APP CONFIG VALUES
# all index values begin at ONE and not at ZERO!
# all index values begin at ONE and not at ZERO!
...
...
src/main/resources/app.yml
View file @
343f5b92
...
@@ -3,12 +3,6 @@ sftp:
...
@@ -3,12 +3,6 @@ sftp:
port
:
${SFTP_PORT:?system}
port
:
${SFTP_PORT:?system}
user
:
${SFTP_USER:?system}
user
:
${SFTP_USER:?system}
password
:
${SFTP_PASSWORD:?system}
password
:
${SFTP_PASSWORD:?system}
app
:
sheet
:
${SHEET_INDEX:?user}
header
:
count
:
${HEADER_COUNT:?user}
line
:
${HEADER_LINE_INDEX:?user}
identifier
:
${IDENTIFIER_INDEX:?user}
kafka
:
kafka
:
streams
:
streams
:
bootstrap.servers
:
${KAFKA_BOOTSTRAP_SERVERS:?system}
bootstrap.servers
:
${KAFKA_BOOTSTRAP_SERVERS:?system}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment