Merge pull request #8 from datopian/improvements

[x][improvements] Default resource allocation
datopian · Jan 22, 2022 · dc989a9 · dc989a9
2 parents 72a88f6 + e680fae
commit dc989a9
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/ckan/templates/job-create-db-backups.yaml b/ckan/templates/job-create-db-backups.yaml
@@ -1,3 +1,4 @@
+{{ if .Values.dbBackup.enable }}
 apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
@@ -45,3 +46,4 @@ spec:
               mc cp {{ .Values.general.projectId }}-datastore.tar.gz {{ .Values.general.projectId }}/dx-cluster-backup/database-backups/{{ .Values.general.projectId }}/$(date '+%d-%m-%y')/{{ .Values.general.projectId }}-datastore$(date '+%d%m%y%H%M%S').tar.gz
               echo Success
           restartPolicy: OnFailure
+{{ end }}
diff --git a/ckan/values.yaml b/ckan/values.yaml
@@ -29,13 +29,27 @@ datapusher:
     repository: registry.gitlab.com/viderum/docker-datapusher
     tag: cloud-datapusher-1-v9
     pullPolicy: Always
+  resources:
+    limits:
+      cpu: 50m
+      memory: 300M
+    requests:
+      cpu: 50m
+      memory: 256M
 
 ckan:
   useIni:
     enable: false
     iniPath: "/srv/app/production.ini"
   hpa:
     enable: false
+  resources:
+    limits:
+      cpu: 250m
+      memory: 1.2G
+    requests:
+      cpu: 200m
+      memory: 1G
   domain: ckan.ckan.staging.datopian.com
   image:
     repository: registry.gitlab.com/datopian/clients/datahub
@@ -55,6 +69,14 @@ frontend:
   enable: false
   hpa:
     enable: false
+  resources:
+    limits:
+      cpu: 250m
+      memory: 1.2G
+    requests:
+      cpu: 200m
+      memory: 1G
+
 
 giftless:
   enable: false
@@ -116,9 +138,9 @@ ingress:
 autoscaling:
   enable: false
   minReplicas: 1
-  maxReplicas: 100
+  maxReplicas: 10
   targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
+  targetMemoryUtilizationPercentage: 60
 
 nodeSelector: {}
 
@@ -128,9 +150,24 @@ affinity: {}
 
 solr:
   enable: true
+  resources:
+    limits:
+      cpu: 100m
+      memory: 1G
+    requests:
+      cpu: 70m
+      memory: 800M
   image:
     tag: 6.6.6
     pullPolicy: Always
+  zookeeper:
+    resources:
+      limits:
+        cpu: 70m
+        memory: 512M
+      requests:
+        cpu: 50m
+        memory: 512M
 
 postgresql:
   enable: false
@@ -147,3 +184,6 @@ auth:
 
 ckanmiddleware:
   enable: false
+
+dbBackup:
+  enable: true