Commit 5668141d authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update k8s labels

parent 2908faab
...@@ -8,7 +8,6 @@ k8sLimitsMemory: "11Gi" ...@@ -8,7 +8,6 @@ k8sLimitsMemory: "11Gi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
inputTopicName: mb-di-processed-records-prod inputTopicName: mb-di-processed-records-prod
reportingTopicName: mb-di-reporting-prod reportingTopicName: mb-di-reporting-prod
applicationId: prod-iiif-manifest-creator
groupId: prod-media-converter groupId: prod-media-converter
clientId: prod-media-converter-client clientId: prod-media-converter-client
......
...@@ -8,7 +8,6 @@ k8sLimitsMemory: "11Gi" ...@@ -8,7 +8,6 @@ k8sLimitsMemory: "11Gi"
kafkaConfigs: prod-kafka-bootstrap-servers kafkaConfigs: prod-kafka-bootstrap-servers
inputTopicName: mb-di-processed-records-stage inputTopicName: mb-di-processed-records-stage
reportingTopicName: mb-di-reporting-stage reportingTopicName: mb-di-reporting-stage
applicationId: stage-iiif-manifest-creator
groupId: stage-media-converter groupId: stage-media-converter
clientId: stage-media-converter-client clientId: stage-media-converter-client
......
...@@ -8,7 +8,6 @@ k8sLimitsMemory: "2Gi" ...@@ -8,7 +8,6 @@ k8sLimitsMemory: "2Gi"
kafkaConfigs: test-kafka-bootstrap-servers kafkaConfigs: test-kafka-bootstrap-servers
inputTopicName: mb-di-processed-records-prod inputTopicName: mb-di-processed-records-prod
reportingTopicName: mb-di-reporting-prod reportingTopicName: mb-di-reporting-prod
applicationId: test-iiif-manifest-creator
groupId: test-media-converter groupId: test-media-converter
clientId: test-media-converter-client clientId: test-media-converter-client
......
...@@ -3,8 +3,12 @@ kind: ConfigMap ...@@ -3,8 +3,12 @@ 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 }}"
labels:
app: "{{ .Values.k8sName }}"
environment: "{{ .Values.k8sEnvironment }}"
group: "{{ .Values.k8sGroupName }}"
data: data:
APPLICATION_ID: "{{ .Values.applicationId }}" APPLICATION_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
TOPIC_IN: "{{ .Values.inputTopicName }}" TOPIC_IN: "{{ .Values.inputTopicName }}"
TOPIC_PROCESS: "{{ .Values.reportingTopicName }}" TOPIC_PROCESS: "{{ .Values.reportingTopicName }}"
CLIENT_ID: "{{ .Values.clientId }}" CLIENT_ID: "{{ .Values.clientId }}"
......
...@@ -4,18 +4,23 @@ metadata: ...@@ -4,18 +4,23 @@ metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}" name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
namespace: "{{ .Values.k8sNamespace }}" namespace: "{{ .Values.k8sNamespace }}"
labels: labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app" app: "{{ .Values.k8sName }}"
environment: "{{ .Values.k8sEnvironment }}"
group: "{{ .Values.k8sGroupName }}"
spec: spec:
selector: selector:
matchLabels: matchLabels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app" app: "{{ .Values.k8sName }}"
replicas: {{ .Values.k8sReplicas}} environment: "{{ .Values.k8sEnvironment }}"
group: "{{ .Values.k8sGroupName }}"
replicas: {{ .Values.k8sReplicas }}
template: template:
metadata: metadata:
labels: labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app" app: "{{ .Values.k8sName }}"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}" environment: "{{ .Values.k8sEnvironment }}"
group: "{{ .Values.k8sGroupName }}"
logging: "{{ .Values.k8sLogging }}"
spec: spec:
containers: containers:
- name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-container" - name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-container"
......
...@@ -7,6 +7,7 @@ k8sNamespace: memobase ...@@ -7,6 +7,7 @@ k8sNamespace: memobase
k8sGroupId: di k8sGroupId: di
k8sGroupName: documents-import k8sGroupName: documents-import
k8sEnvironment: placeholder k8sEnvironment: placeholder
k8sLogging: sca
k8sReplicas: placeholder k8sReplicas: placeholder
k8sRequestsCpu: placeholder k8sRequestsCpu: placeholder
k8sRequestsMemory: placeholder k8sRequestsMemory: placeholder
...@@ -16,7 +17,6 @@ k8sLimitsMemory: placeholder ...@@ -16,7 +17,6 @@ k8sLimitsMemory: placeholder
kafkaConfigs: placeholder kafkaConfigs: placeholder
inputTopicName: placeholder inputTopicName: placeholder
reportingTopicName: placeholder reportingTopicName: placeholder
applicationId: placeholder
groupId: placeholder groupId: placeholder
clientId: placeholder clientId: 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