chore(charts): change resources format

Author: duanhongyi

charts/passport/templates/_helpers.tpl

@@ -79,21 +79,6 @@ env:
 {{- end }}
 
 
-{{/* Generate passport deployment limits */}}
-{{- define "passport.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 passport deployment volumeMounts */}}
 {{- define "passport.volumeMounts" }}
 volumeMounts:

charts/passport/templates/passport-deployment.yaml

@@ -62,7 +62,10 @@ spec:
         ports:
           - containerPort: 8000
             name: http
-        {{- include "passport.limits" . | indent 8 }}
+        {{- with index .Values "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- include "passport.envs" . | indent 8 }}
         {{- include "passport.volumeMounts" . | indent 8 }}
       {{- include "passport.volumes" . | indent 6 }}

charts/passport/templates/passport-job-upgrade.yaml

@@ -39,7 +39,10 @@ spec:
           fi
           python /workspace/manage.py create_oauth2_application --path /etc/drycc/passport/init-applications.json
         {{- end }}
-        {{- include "passport.limits" . | indent 8 }}
+        {{- with index .Values "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- include "passport.envs" . | indent 8 }}
         {{- include "passport.volumeMounts" . | indent 8 }}
       {{- include "passport.volumes" . | indent 6 }}

charts/passport/values.yaml

@@ -18,6 +18,14 @@ diagnosticMode:
   args:
     - infinity
 
+resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 50Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 30Mi
+
 nodeAffinityPreset:
   key: "drycc.cc/node"
   type: "soft"
@@ -36,9 +44,6 @@ podAntiAffinityPreset:
 
 # Set passport deployment replicas
 replicas: 1
-# limitsCpu: "100m"
-# limitsMemory: "50Mi"
-
 ## valkeyUrl is will no longer use the built-in valkey component
 valkeyUrl: ""
 ## databaseUrl and databaseReplicaUrl are will no longer use the built-in database component