Update scructure of portalmodelo values for replicaCount and resources

charts/portalmodelo/v0.6.0/templates/plone-deployment.yaml

@@ -14,7 +14,7 @@ spec:
   {{- if .Values.portal.createAndUpgrade }}
   replicas: 0
   {{- else }}
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.instance.replicaCount }}
   {{- end }}
   {{- end }}
   strategy:
@@ -111,7 +111,7 @@ spec:
               name: data
           {{- end }}
           resources:
-            {{- toYaml .Values.resources.plone | nindent 12 }}
+            {{- toYaml .Values.instance.resources | nindent 12 }}
       restartPolicy: Always
       {{- if and .Values.persistence.enabled (not .Values.instance.zeoclient) }}
       volumes:

charts/portalmodelo/v0.6.0/templates/zeoserver-deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   labels:
     {{- include "portalmodelo.labels" . | nindent 4 }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.zeoserver.replicaCount }}
   strategy:
     type: Recreate
   selector:
@@ -101,7 +101,7 @@ spec:
             successThreshold: 1
             timeoutSeconds: 3
           resources:
-            {{- toYaml .Values.resources.zeo | nindent 12 }}
+            {{- toYaml .Values.zeoserver.resources | nindent 12 }}
       restartPolicy: Always
       volumes:
         - name: data

charts/portalmodelo/v0.6.0/values.yaml

@@ -2,8 +2,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 1
-
 image:
   repository: interlegis/portalmodelo
   pullPolicy: IfNotPresent
@@ -53,6 +51,24 @@ instance:
     enabled: true
     schedule: "0 1 * * SUN" # Every Sunday at 1AM
     keepDays: 30
+  replicaCount: 1
+  resources:
+    limits:
+      cpu: 1000m
+      memory: 1600Mi
+    requests:
+      cpu: 100m
+      memory: 750Mi
+
+zeoserver:
+  replicaCount: 1
+  resources:
+    limits:
+      cpu: 1000m
+      memory: 512Mi
+    requests:
+      cpu: 50m
+      memory: 112Mi
 
 repozo:
   enabled: false
@@ -86,22 +102,6 @@ ingress:
   # extra annotations only
   annotations: {}
 
-resources:
-  plone:
-    limits:
-      cpu: 1000m
-      memory: 1600Mi
-    requests:
-      cpu: 100m
-      memory: 750Mi
-  zeo:
-    limits:
-      cpu: 1000m
-      memory: 512Mi
-    requests:
-      cpu: 50m
-      memory: 112Mi
-
 autoscaling:
   enabled: false
   minReplicas: 1