Commit 680c7437 authored by Thomas Bernhart's avatar Thomas Bernhart
Browse files

Simplify helm charts

parent 6f446ff9
Pipeline #24857 failed with stages
in 3 minutes and 43 seconds
deploymentName: di-fedora-indexer-prod
k8sName: fedora-indexer
k8sNamespace: memobase
k8sGroupId: di k8sGroupId: di
k8sGroupName: documents-import k8sGroupName: documents-import
k8sEnvironment: prod k8sEnvironment: prod
k8sReplicas: 1 k8sReplicas: 1
k8sRequestsCpu: "0.2" k8sRequestsCpu: "0.5"
k8sRequestsMemory: "0.2Gi" k8sRequestsMemory: "0.256Mi"
k8sLimitsCpu: "1" k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi" k8sLimitsMemory: "1Gi"
...@@ -19,5 +15,3 @@ isSimple: false ...@@ -19,5 +15,3 @@ isSimple: false
inputTopicName: mb-di-ingest-prod inputTopicName: mb-di-ingest-prod
outputTopicName: void_topic outputTopicName: void_topic
reportingTopicName: mb-di-reporting-prod reportingTopicName: mb-di-reporting-prod
\ No newline at end of file
clientId: prod-di-fedora-indexer
\ No newline at end of file
deploymentName: gi-fedora-indexer-prod
k8sName: fedora-indexer
k8sNamespace: memobase
k8sGroupId: gi k8sGroupId: gi
k8sGroupName: group-import k8sGroupName: group-import
k8sEnvironment: prod k8sEnvironment: prod
k8sReplicas: 1 k8sReplicas: 1
k8sRequestsCpu: "0.2" k8sRequestsCpu: "0.5"
k8sRequestsMemory: "0.2Gi" k8sRequestsMemory: "128Mi"
k8sLimitsCpu: "1" k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi" k8sLimitsMemory: "512Mi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
sftpConfigs: internal-sftp-config sftpConfigs: internal-sftp-config
...@@ -19,5 +15,3 @@ isSimple: true ...@@ -19,5 +15,3 @@ isSimple: true
inputTopicName: mb-gi-rdf-objects-prod inputTopicName: mb-gi-rdf-objects-prod
outputTopicName: void_topic outputTopicName: void_topic
reportingTopicName: mb-di-reporting-prod reportingTopicName: mb-di-reporting-prod
clientId: prod-gi-fedora-indexer
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-config" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
namespace: "{{ .Values.k8sNamespace }}" namespace: "{{ .Values.k8sNamespace }}"
data: data:
CLIENT_ID: {{ .Values.clientId }} CLIENT_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
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 }} name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
namespace: memobase namespace: "{{ .Values.k8sNamespace }}"
labels: labels:
app: {{ .Values.deploymentName }}-app app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
spec: spec:
selector: selector:
matchLabels: matchLabels:
app: {{ .Values.deploymentName }}-app app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
replicas: 1 replicas: "{{ .Values.k8sReplicas}}"
template: template:
metadata: metadata:
labels: labels:
app: {{ .Values.deploymentName }}-app app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
tier: import-process #FIXME: web? group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
spec: spec:
containers: containers:
- name: "{{ .Values.deploymentName }}-container" - name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-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: "{{ .Values.k8sRequestsCpu }}"
memory: "128Mi" memory: "{{ .Values.k8sRequestsMemory }}"
limits: limits:
cpu: "1" cpu: "{{ .Values.k8sLimitsCpu }}"
memory: "1Gi" memory: "{{ .Values.k8sLimitsMemory }}"
envFrom: envFrom:
- secretRef: - secretRef:
name: "{{ .Values.sftpConfigs }}" name: "{{ .Values.sftpConfigs }}"
......
...@@ -3,7 +3,16 @@ registry: "cr.gitlab.switch.ch" ...@@ -3,7 +3,16 @@ 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: placeholder k8sName: fedora-indexer
k8sNamespace: memobase
k8sGroupId: placeholder
k8sGroupName: placeholder
k8sEnvironment: placeholder
k8sReplicas: placeholder
k8sRequestsCpu: placeholder
k8sRequestsMemory: placeholder
k8sLimitsCpu: placeholder
k8sLimitsMemory: placeholder
kafkaConfigs: placeholder kafkaConfigs: placeholder
sftpConfigs: placeholder sftpConfigs: placeholder
...@@ -13,5 +22,3 @@ isSimple: placeholder ...@@ -13,5 +22,3 @@ isSimple: placeholder
inputTopicName: placeholder inputTopicName: placeholder
outputTopicName: placeholder outputTopicName: placeholder
reportingTopicName: placeholder reportingTopicName: placeholder
\ No newline at end of file
clientId: placeholder
\ No newline at end of file
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