Bug Fix: Schema list resources as object

Closes #210 Signed-off-by: Itay Grudev <[email protected]>
cloudnative-pg · Mar 13, 2024 · c21e9a9 · c21e9a9
1 parent aab8c3a
commit c21e9a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/charts/cluster/README.md b/charts/cluster/README.md
@@ -158,7 +158,7 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | cluster.primaryUpdateMethod | string | `"switchover"` | Method to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated. It can be switchover (default) or in-place (restart). |
 | cluster.primaryUpdateStrategy | string | `"unsupervised"` | Strategy to follow to upgrade the primary server during a rolling update procedure, after all replicas have been successfully updated: it can be automated (unsupervised - default) or manual (supervised) |
 | cluster.priorityClassName | string | `""` |  |
-| cluster.resources | string | `nil` | Resources requirements of every generated Pod. Please refer to https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ for more information. We strongly advise you use the same setting for limits and requests so that your cluster pods are given a Guaranteed QoS. See: https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/ |
+| cluster.resources | object | `{}` | Resources requirements of every generated Pod. Please refer to https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ for more information. We strongly advise you use the same setting for limits and requests so that your cluster pods are given a Guaranteed QoS. See: https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/ |
 | cluster.storage.size | string | `"8Gi"` |  |
 | cluster.storage.storageClass | string | `""` |  |
 | cluster.superuserSecret | string | `""` |  |

diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
@@ -173,14 +173,14 @@
                         }
                     }
                 },
-                "postgresql": {
-                    "type": "object"
+                "postgresGID": {
+                    "type": "integer"
                 },
                 "postgresUID": {
                     "type": "integer"
                 },
-                "postgresGID": {
-                    "type": "integer"
+                "postgresql": {
+                    "type": "object"
                 },
                 "primaryUpdateMethod": {
                     "type": "string"
@@ -192,7 +192,7 @@
                     "type": "string"
                 },
                 "resources": {
-                    "type": "null"
+                    "type": "object"
                 },
                 "storage": {
                     "type": "object",

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -92,15 +92,15 @@ cluster:
 
   # -- The UID of the postgres user inside the image, defaults to 26
   postgresUID: 26
-  
+
   # -- The GID of the postgres user inside the image, defaults to 26
   postgresGID: 26
 
   # -- Resources requirements of every generated Pod.
   # Please refer to https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ for more information.
   # We strongly advise you use the same setting for limits and requests so that your cluster pods are given a Guaranteed QoS.
   # See: https://kubernetes.io/docs/concepts/workloads/pods/pod-qos/
-  resources:
+  resources: {}
     # limits:
     #   cpu: 2000m
     #   memory: 8Gi