Commit 248f1092 authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update labels

Simplify chart
parent 7ee74503
deploymentName: gi-reports-consumer-prod
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
inputTopic: mb-di-processed-reporting-prod inputTopic: mb-di-processed-reporting-prod
reportingTopic: mb-di-reports-reporting-prod reportingTopic: mb-di-reports-reporting-prod
......
deploymentName: gi-reports-consumer-stage
kafkaConfigs: stage-kafka-bootstrap-servers kafkaConfigs: stage-kafka-bootstrap-servers
inputTopic: mb-di-processed-reporting-stage inputTopic: mb-di-processed-reporting-stage
reportingTopic: mb-di-reports-reporting-stage reportingTopic: mb-di-reports-reporting-stage
......
deploymentName: gi-reports-consumer-test
kafkaConfigs: test-kafka-bootstrap-servers kafkaConfigs: test-kafka-bootstrap-servers
inputTopic: mb-di-processed-reporting-prod inputTopic: mb-di-processed-reporting-prod
reportingTopic: mb-di-reports-reporting-prod reportingTopic: mb-di-reports-reporting-prod
......
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: "{{ .Values.deploymentName }}-app-config" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
namespace: memobase namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sName }}"
environment: "{{ .Values.k8sEnvironment }}"
group: "{{ .Values.k8sGroupName }}"
data: data:
API_ENDPOINT_URL: "https://{{ .Values.importApiName }}-{{ .Values.k8sEnvironment}}-service:{{ .Values.importApiPort}}{{ .Values.importApiPath }}" API_ENDPOINT_URL: "https://{{ .Values.importApiName }}-{{ .Values.k8sEnvironment}}-service:{{ .Values.importApiPort}}{{ .Values.importApiPath }}"
STEP_WHITE_LIST_FILE_PATH: "{{ .Values.whitelistFilePath }}" STEP_WHITE_LIST_FILE_PATH: "{{ .Values.whitelistFilePath }}"
ENVIRONMENT: "{{.Values.k8sEnvironment }}" ENVIRONMENT: "{{.Values.k8sEnvironment }}"
APPLICATION_ID: "{{ .Values.deploymentName }}-{{ .Values.k8sEnvironment }}-app" APPLICATION_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
TOPIC_IN: "{{ .Values.inputTopic }}" TOPIC_IN: "{{ .Values.inputTopic }}"
TOPIC_OUT: "not-used" TOPIC_OUT: "not-used"
TOPIC_PROCESS: "{{ .Values.reportingTopic }}" TOPIC_PROCESS: "{{ .Values.reportingTopic }}"
\ No newline at end of file
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: "{{ .Values.deploymentName }}-deployment" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
namespace: memobase namespace: "{{ .Values.k8sNamespace }}"
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 }}"
replicas: 1 environment: "{{ .Values.k8sEnvironment }}"
group: "{{ .Values.k8sGroupName }}"
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 }}"
logging: "{{ .Values.k8sLogging }}"
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:
...@@ -34,7 +37,7 @@ spec: ...@@ -34,7 +37,7 @@ spec:
- configMapRef: - configMapRef:
name: "{{ .Values.kafkaConfigs }}" name: "{{ .Values.kafkaConfigs }}"
- configMapRef: - configMapRef:
name: "{{ .Values.deploymentName}}-app-config" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
volumeMounts: volumeMounts:
- name: {{ .Values.whitelistFileConfig }} - name: {{ .Values.whitelistFileConfig }}
mountPath: "/configs" mountPath: "/configs"
......
...@@ -3,14 +3,18 @@ registry: "cr.gitlab.switch.ch" ...@@ -3,14 +3,18 @@ registry: "cr.gitlab.switch.ch"
image: "memoriav/memobase-2020/services/import-process/group-reports-consumer" image: "memoriav/memobase-2020/services/import-process/group-reports-consumer"
tag: "latest" tag: "latest"
k8sName: reports-aggregator
k8sNamespace: memobase
k8sGroupId: gi
k8sGroupName: group-import
k8sEnvironment: placeholder k8sEnvironment: placeholder
k8sLogging: java
k8sReplicas: 1 k8sReplicas: 1
k8sRequestsCpu: "0.1" k8sRequestsCpu: "0.1"
k8sRequestsMemory: "128Mi" k8sRequestsMemory: "128Mi"
k8sLimitsCpu: "0.5" k8sLimitsCpu: "0.5"
k8sLimitsMemory: "512Mi" k8sLimitsMemory: "512Mi"
deploymentName: placeholder
kafkaConfigs: placeholder kafkaConfigs: placeholder
inputTopic: placeholder inputTopic: placeholder
reportingTopic: placeholder reportingTopic: placeholder
......
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