chore(charts): change resources format

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -180,20 +180,6 @@ env:
   value: api.routers.DefaultReplicaRouter
 {{- end }}
 
-{{/* Generate controller deployment limits */}}
-{{- define "controller.limits" -}}
-{{- if or (.Values.limitsCpu) (.Values.limitsMemory) }}
-resources:
-  limits:
-{{- if (.Values.limitsCpu) }}
-    cpu: {{.Values.limitsCpu}}
-{{- end }}
-{{- if (.Values.limitsMemory) }}
-    memory: {{.Values.limitsMemory}}
-{{- end }}
-{{- end }}
-{{- end }}
-
 {{/* Generate controller config default limit specs */}}
 {{ define "controller.config.defaultLimitSpecs" }}
 - model: api.limitspec

charts/controller/templates/controller-api-deployment.yaml

@@ -70,7 +70,10 @@ spec:
         ports:
           - containerPort: 8000
             name: http
-        {{- include "controller.limits" . | indent 8 }}
+        {{- with index .Values "api" "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- include "controller.envs" . | indent 8 }}
         volumeMounts:
         - name: controller-config

charts/controller/templates/controller-celery-deloyment.yaml

@@ -51,7 +51,10 @@ spec:
           - -c
           - celery --app api worker --queues controller.low,controller.middle,controller.high --autoscale=32,1 --loglevel=WARNING
         {{- end }}
-        {{- include "controller.limits" $ | indent 8 }}
+        {{- with index .Values "celery" "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- include "controller.envs" $ | indent 8 }}
         volumeMounts:
         - name: controller-config

charts/controller/templates/controller-mutate-deloyment.yaml

@@ -59,7 +59,10 @@ spec:
         volumeMounts:
         - name: controller-mutate-cert
           mountPath: /etc/controller/mutate/cert
-        {{- include "controller.limits" . | indent 8 }}
+        {{- with index .Values "mutate" "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- include "controller.envs" . | indent 8 }}
       volumes:
       - name: controller-mutate-cert                                                                                                                                                                                               

charts/controller/values.yaml

@@ -20,8 +20,6 @@ diagnosticMode:
 # See https://www.drycc.cc/managing-workflow/deploy-hooks/
 deployHookUrls: ""
 timezone: "UTC"
-# limitsCpu: "100m"
-# limitsMemory: "50Mi"
 # Possible values are:
 # enabled - allows for open registration
 # disabled - turns off open registration
@@ -93,6 +91,13 @@ environment:
   RESERVED_NAMES: "drycc, drycc-builder, drycc-grafana, drycc-passport, drycc-helmbroker, drycc-manager"
 
 api:
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 50Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 30Mi
   nodeAffinityPreset:
     key: "drycc.cc/node"
     type: "soft"
@@ -108,6 +113,13 @@ api:
       app: "drycc-controller-api"
 
 celery:
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 50Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 30Mi
   nodeAffinityPreset:
     key: "drycc.cc/node"
     type: "soft"
@@ -123,6 +135,13 @@ celery:
       app: "drycc-controller-celery"
 
 mutate:
+  resources: {}
+    # limits:
+    #   cpu: 200m
+    #   memory: 50Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 30Mi
   nodeAffinityPreset:
     key: "drycc.cc/node"
     type: "soft"