Commit 685d5692 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update labels

parent 0077f80a
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
deploymentName: di-reports-processor-prod
inputTopicName: mb-di-reporting-prod inputTopicName: mb-di-reporting-prod
outputTopicName: mb-di-processed-reporting-prod outputTopicName: mb-di-processed-reporting-prod
reportingTopicName: none reportingTopicName: none
......
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
deploymentName: di-reports-processor-stage
inputTopicName: mb-di-reporting-stage inputTopicName: mb-di-reporting-stage
outputTopicName: mb-di-processed-reporting-stage outputTopicName: mb-di-processed-reporting-stage
reportingTopicName: none reportingTopicName: none
......
kafkaConfigs: test-kafka-bootstrap-servers kafkaConfigs: test-kafka-bootstrap-servers
deploymentName: di-reports-processor-test
inputTopicName: mb-di-reporting-prod inputTopicName: mb-di-reporting-prod
outputTopicName: mb-di-processed-reporting-prod outputTopicName: mb-di-processed-reporting-prod
reportingTopicName: none reportingTopicName: none
......
...@@ -4,7 +4,7 @@ metadata: ...@@ -4,7 +4,7 @@ metadata:
name: "{{ .Values.deploymentName }}-config" name: "{{ .Values.deploymentName }}-config"
namespace: memobase namespace: memobase
data: data:
APPLICATION_ID: {{ .Values.deploymentName }} APPLICATION_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
TOPIC_IN: {{ .Values.inputTopicName }} TOPIC_IN: {{ .Values.inputTopicName }}
TOPIC_OUT: {{ .Values.outputTopicName }} TOPIC_OUT: {{ .Values.outputTopicName }}
TOPIC_PROCESS: {{ .Values.reportingTopicName }} TOPIC_PROCESS: {{ .Values.reportingTopicName }}
\ No newline at end of file
...@@ -2,27 +2,29 @@ apiVersion: apps/v1 ...@@ -2,27 +2,29 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: "{{ .Values.deploymentName }}-deployment" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-deployment"
namespace: memobase namespace: memobase
labels: labels:
app: "{{ .Values.deploymentName }}" app: "{{ .Values.k8sName }}"
environment: {{ .Values.k8sEnvironment }} environment: {{ .Values.k8sEnvironment }}
group: "documents-import" group: {{ .Values.k8sGroupName }}
spec: spec:
selector: selector:
matchLabels: matchLabels:
app: {{ .Values.deploymentName }} app: {{ .Values.k8sName }}
environment: {{ .Values.k8sEnvironment }}
group: {{ .Values.k8sGroupName }}
replicas: {{ .Values.k8sReplicas }} replicas: {{ .Values.k8sReplicas }}
template: template:
metadata: metadata:
labels: labels:
app: "{{ .Values.deploymentName }}" app: "{{ .Values.k8sName }}"
environment: {{ .Values.k8sEnvironment }} environment: {{ .Values.k8sEnvironment }}
group: "documents-import" group: {{ .Values.k8sGroupName }}
spec: spec:
restartPolicy: Always restartPolicy: Always
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:
...@@ -36,4 +38,4 @@ spec: ...@@ -36,4 +38,4 @@ spec:
- configMapRef: - configMapRef:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.deploymentName }}-config" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
\ No newline at end of file \ No newline at end of file
...@@ -2,7 +2,11 @@ registry: "cr.gitlab.switch.ch" ...@@ -2,7 +2,11 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/reports-processor" image: "memoriav/memobase-2020/services/import-process/reports-processor"
tag: "latest" tag: "latest"
k8sEnvironment: placeholder
k8sName: "reports-processor"
k8sGroupId: "di"
k8sGroupName: "documents-import"
k8sEnvironment: "placeholder"
k8sReplicas: 3 k8sReplicas: 3
k8sRequestsCpu: "0.1" k8sRequestsCpu: "0.1"
k8sRequestsMemory: "128Mi" k8sRequestsMemory: "128Mi"
...@@ -10,7 +14,6 @@ k8sLimitsCpu: "0.5" ...@@ -10,7 +14,6 @@ k8sLimitsCpu: "0.5"
k8sLimitsMemory: "512Mi" k8sLimitsMemory: "512Mi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
deploymentName: placeholder
inputTopicName: import-process-reporting inputTopicName: import-process-reporting
outputTopicName: import-process-processed-reporting outputTopicName: import-process-processed-reporting
reportingTopicName: none reportingTopicName: none
\ 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