chore(charts): change resources format

Author: duanhongyi

charts/registry/templates/_helper.tpl

@@ -69,23 +69,3 @@ env:
       key: secretkey
 {{- end }}
 {{- end }}
-
-{{/* Generate registry deployment limits */}}
-{{- define "registry.limits" -}}
-{{- if or (.Values.limitsCpu) (.Values.limitsMemory)}}
-resources:
-  limits:
-    {{- if (.Values.limitsCpu) }}
-    cpu: {{.Values.limitsCpu}}
-    {{- end }}
-    {{- if (.Values.limitsMemory) }}
-    memory: {{.Values.limitsMemory}}
-    {{- end }}
-    {{- if (.Values.limitsHugepages2Mi) }}
-    hugepages-2Mi: {{.Values.limitsHugepages2Mi}}
-    {{- end }}
-    {{- if (.Values.limitsHugepages1Gi) }}
-    hugepages-1Gi: {{.Values.limitsHugepages1Gi}}
-    {{- end }}
-{{- end }}
-{{- end }}

charts/registry/templates/registry-deployment.yaml

@@ -47,7 +47,10 @@ spec:
         args:
         - start-registry
         {{- end }}
-        {{- include "registry.limits" . | indent 8 }}
+        {{- with index .Values "resources" }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- include "registry.envs" . | indent 8 }}
         {{- if not .Values.diagnosticMode.enabled }}
         startupProbe:

charts/registry/templates/registry-proxy-daemonset.yaml

@@ -47,16 +47,10 @@ spec:
         args:
         - start-proxy
         {{- end }}
-        {{- if or (.Values.limitsCpu) (.Values.limitsMemory)}}
+        {{- with index .Values "proxy" "resources" }}
         resources:
-          limits:
-            {{- if (.Values.limitsCpu) }}
-            cpu: {{.Values.limitsCpu}}
-            {{- end}}
-            {{- if (.Values.limitsMemory) }}
-            memory: {{.Values.limitsMemory}}
-            {{- end}}
-        {{- end}}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if not .Values.diagnosticMode.enabled }}
         startupProbe:
           httpGet:
@@ -101,4 +95,4 @@ spec:
               key: password
         ports:
         - containerPort: 8080
-          hostPort: {{.Values.proxyPort}}
+          hostPort: {{.Values.proxy.port}}

charts/registry/values.yaml

@@ -2,8 +2,6 @@ imageOrg: "drycc"
 imagePullPolicy: "Always"
 imageTag: "canary"
 imageRegistry: "registry.drycc.cc"
-# limitsCpu: "100m"
-# limitsMemory: "50Mi"
 
 ## Enable diagnostic mode
 ##
@@ -40,8 +38,25 @@ podAntiAffinityPreset:
 replicas: 1
 # registry storage redirect
 redirect: "false"
-# host port for the registry proxy in the daemonset
-proxyPort: 5555
+
+proxy:
+  # host port for the registry proxy in the daemonset
+  port: 5555
+  resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 50Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 30Mi
+
+resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 50Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 30Mi
 
 concurrencyPolicy: "Replace"
 
@@ -59,3 +74,11 @@ storage:
 service:
   # Provide any additional service annotations
   annotations: {}
+
+resources: {}
+  # limits:
+  #   cpu: 200m
+  #   memory: 50Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 30Mi