Simplify helm charts

helm-charts/helm-values/di-fedora-indexer-prod.yml

-deploymentName: di-fedora-indexer-prod
-
-k8sName: fedora-indexer
-k8sNamespace: memobase
 k8sGroupId: di
 k8sGroupName: documents-import
 k8sEnvironment: prod
 k8sReplicas: 1
-k8sRequestsCpu: "0.2"
-k8sRequestsMemory: "0.2Gi"
+k8sRequestsCpu: "0.5"
+k8sRequestsMemory: "0.256Mi"
 k8sLimitsCpu: "1"
 k8sLimitsMemory: "1Gi"
 
@@ -18,6 +14,4 @@ isSimple: false
 
 inputTopicName: mb-di-ingest-prod
 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

helm-charts/helm-values/gi-fedora-indexer-prod.yml

-deploymentName: gi-fedora-indexer-prod
-
-k8sName: fedora-indexer
-k8sNamespace: memobase
 k8sGroupId: gi
 k8sGroupName: group-import
 k8sEnvironment: prod
 k8sReplicas: 1
-k8sRequestsCpu: "0.2"
-k8sRequestsMemory: "0.2Gi"
+k8sRequestsCpu: "0.5"
+k8sRequestsMemory: "128Mi"
 k8sLimitsCpu: "1"
-k8sLimitsMemory: "1Gi"
+k8sLimitsMemory: "512Mi"
 
 kafkaConfigs: prod-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
@@ -19,5 +15,3 @@ isSimple: true
 inputTopicName: mb-gi-rdf-objects-prod
 outputTopicName: void_topic
 reportingTopicName: mb-di-reporting-prod
-
-clientId: prod-gi-fedora-indexer

helm-charts/templates/app-config.yaml

 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-config"
+  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-config"
   namespace: "{{ .Values.k8sNamespace }}"
   data:
-    CLIENT_ID: {{ .Values.clientId }}
+    CLIENT_ID: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}"
     IS_SIMPLE: "{{ .Values.isSimple }}"
-    TOPIC_IN: {{ .Values.inputTopicName }}
-    TOPIC_OUT: {{ .Values.outputTopicName }}
-    TOPIC_REPORTING: {{ .Values.reportingTopicName }}
+    TOPIC_IN: "{{ .Values.inputTopicName }}"
+    TOPIC_OUT: "{{ .Values.outputTopicName }}"
+    TOPIC_REPORTING: "{{ .Values.reportingTopicName }}"

helm-charts/templates/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ .Values.deploymentName }}
-  namespace: memobase
+  name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}"
+  namespace: "{{ .Values.k8sNamespace }}"
   labels:
-    app: {{ .Values.deploymentName }}-app
+    app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
 spec:
   selector:
     matchLabels:
-      app: {{ .Values.deploymentName }}-app
-  replicas: 1
+      app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
+  replicas: "{{ .Values.k8sReplicas}}"
   template:
     metadata:
       labels:
-        app: {{ .Values.deploymentName }}-app
-        tier: import-process #FIXME: web?
+        app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
+        group: "{{ .Values.k8sGroupName }}"
+        environment: "{{ .Values.k8sEnvironment }}"
     spec:
       containers:
-        - name: "{{ .Values.deploymentName }}-container"
+        - name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-container"
           image: "{{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}"
           imagePullPolicy: Always
           resources:
             requests:
-              cpu: "0.5"
-              memory: "128Mi"
+              cpu: "{{ .Values.k8sRequestsCpu }}"
+              memory: "{{ .Values.k8sRequestsMemory }}"
             limits:
-              cpu: "1"
-              memory: "1Gi"
+              cpu: "{{ .Values.k8sLimitsCpu }}"
+              memory: "{{ .Values.k8sLimitsMemory }}"
           envFrom:
           - secretRef:
               name: "{{ .Values.sftpConfigs }}"

helm-charts/values.yaml

@@ -3,7 +3,16 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/import-process/fedora-ingest-service"
 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
 sftpConfigs: placeholder
@@ -12,6 +21,4 @@ isSimple: placeholder
 
 inputTopicName: placeholder
 outputTopicName: placeholder
-reportingTopicName: placeholder
-
+reportingTopicName: placeholder
\ No newline at end of file
-clientId: placeholder
\ No newline at end of file