chore(charts): change resources format

Author: duanhongyi

charts/builder/templates/_helpers.tpl

@@ -114,17 +114,3 @@ env:
   value: {{.Values.builderPodNodeSelector}}
 {{- end }}
 {{- end }}
-
-{{/* Generate builder deployment limits */}}
-{{- define "builder.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 }}

charts/builder/templates/builder-deployment.yaml

@@ -52,7 +52,10 @@ spec:
           - containerPort: 8092
             name: healthsrv
         {{- include "builder.envs" . | indent 8 }}
-        {{- include "builder.limits" . | indent 8 }}
+        {{- with index .Values "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if not .Values.diagnosticMode.enabled }}
         livenessProbe:
           httpGet:

charts/builder/values.yaml

@@ -25,8 +25,14 @@ service:
   annotations: {}
   # Service type default to LoadBalancer
   type: ClusterIP
-# limitsCpu: "100m"
-# limitsMemory: "50Mi"
+
+resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 50Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 30Mi
 
 nodeAffinityPreset:
   key: "drycc.cc/node"