charts/timescaledb-single: added resources to jobs and cronjobs

timescale · Feb 20, 2023 · bea8ce1 · bea8ce1
1 parent b9cbc2d
commit bea8ce1
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 38 deletions.
diff --git a/charts/timescaledb-single/Chart.yaml b/charts/timescaledb-single/Chart.yaml
@@ -4,7 +4,7 @@
 apiVersion: v1
 name: timescaledb-single
 description: 'TimescaleDB HA Deployment.'
-version: 0.33.1
+version: 0.34.0
 icon: https://cdn.iconscout.com/icon/free/png-256/timescaledb-1958407-1651618.png
 
 # appVersion specifies the version of the software, which can vary wildly,

diff --git a/charts/timescaledb-single/docs/admin-guide.md b/charts/timescaledb-single/docs/admin-guide.md
@@ -30,6 +30,7 @@ The following table lists the configurable parameters of the TimescaleDB Helm ch
 | `backup.resources`                | Any resources you wish to assign to the pgbackrest container                                                       | `{}` |
 | `callbacks.configMap`             | A kubernetes ConfigMap containing [Patroni callbacks](#callbacks). You can use templates in the name. | `nil`                         |
 | `clusterName`                     | Override the name of the PostgreSQL cluster | Equal to the Helm release name                      |
+| `curl.resources`                  | Any resources you wish to assign to the job and cronjob containers which are using the curl image | `{}` |
 | `env`                             | Extra custom environment variables, expressed as [EnvVar](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.16/#envvarsource-v1-core)   | `[]`                                                |
 | `envFrom`                         | Extra custom environment variables, expressed as [EnvFrom](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.16/#envfromsource-v1-core) | `[]`                                                |
 | `fullnameOverride`                | Override the fullname of the chart          | `nil`                                               |

diff --git a/charts/timescaledb-single/templates/job-update-patroni.yaml b/charts/timescaledb-single/templates/job-update-patroni.yaml
@@ -46,3 +46,5 @@ spec:
           {{ .Values.patroni.bootstrap.dcs | toJson | quote }} \
           "http://{{ template "clusterName" . }}-config:8008/config"
           exit 0
+        resources:
+          {{- toYaml .Values.curl.resources | nindent 10 }}
diff --git a/charts/timescaledb-single/templates/pgbackrest.yaml b/charts/timescaledb-single/templates/pgbackrest.yaml
@@ -71,6 +71,8 @@ spec:
               - |
                   {"type": {{ quote .type }}}
               - "http://{{ template "timescaledb.fullname" $ }}-backup:8081/backups/"
+              resources:
+                {{- toYaml $.Values.curl.resources | nindent 16 }}
 ...
 {{- end }}
 {{ end }}
diff --git a/charts/timescaledb-single/templates/statefulset-timescaledb.yaml b/charts/timescaledb-single/templates/statefulset-timescaledb.yaml
@@ -93,7 +93,7 @@ spec:
           mountPath: {{ template "scripts_dir" . }}
           readOnly: true
         resources:
-          {{ toYaml .Values.resources | nindent 10 }}
+          {{- toYaml .Values.resources | nindent 10 }}
       {{- end }}
       # Issuing the final checkpoints on a busy database may take considerable time.
       # Unfinished checkpoints will require more time during startup, so the tradeoff
@@ -318,7 +318,7 @@ spec:
           name: pgbackrest-bootstrap
           readOnly: true
         resources:
-          {{ toYaml .Values.resources | nindent 10 }}
+          {{- toYaml .Values.resources | nindent 10 }}
 
       {{- if .Values.pgBouncer.enabled }}
       - name: pgbouncer
@@ -375,7 +375,7 @@ spec:
         - containerPort: 8081
           name: pgbackrest
         resources:
-          {{ toYaml .Values.backup.resources | nindent 10 }}
+          {{- toYaml .Values.backup.resources | nindent 10 }}
         volumeMounts:
         - name: socket-directory
           mountPath: /var/run/postgresql

diff --git a/charts/timescaledb-single/values.schema.json b/charts/timescaledb-single/values.schema.json
@@ -6,6 +6,24 @@
       "mimimum": 0,
       "type": "integer"
     },
+    "resources": {
+      "additionalProperties": false,
+      "properties": {
+        "limits": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "type": "object"
+        },
+        "requests": {
+          "additionalProperties": {
+            "type": "string"
+          },
+          "type": "object"
+        }
+      },
+      "type": "object"
+    },
     "service": {
       "additionalProperties": false,
       "properties": {
@@ -142,10 +160,7 @@
           ]
         },
         "resources": {
-          "type": [
-            "object",
-            "null"
-          ]
+          "$ref": "#/definitions/resources"
         }
       },
       "required": [
@@ -192,6 +207,15 @@
       "maxLength": 30,
       "type": "string"
     },
+    "curl": {
+      "additionalProperties": false,
+      "properties": {
+        "resources": {
+          "$ref": "#/definitions/resources"
+        }
+      },
+      "type": "object"
+    },
     "curlImage": {
       "additionalProperties": false,
       "properties": {
@@ -682,22 +706,7 @@
       "type": "integer"
     },
     "resources": {
-      "additionalProperties": false,
-      "properties": {
-        "limits": {
-          "additionalProperties": {
-            "type": "string"
-          },
-          "type": "object"
-        },
-        "requests": {
-          "additionalProperties": {
-            "type": "string"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
+      "$ref": "#/definitions/resources"
     },
     "schedulerName": {
       "type": "string"

diff --git a/charts/timescaledb-single/values.schema.yaml b/charts/timescaledb-single/values.schema.yaml
@@ -163,17 +163,7 @@ properties:
       - array
       - "null"
   resources:
-    type: object
-    additionalProperties: false
-    properties:
-      limits:
-        type: object
-        additionalProperties:
-          type: string
-      requests:
-        type: object
-        additionalProperties:
-          type: string
+    "$ref": "#/definitions/resources"
   affinity:
     type: object
     additionalProperties: true
@@ -469,9 +459,7 @@ properties:
           - array
           - "null"
       resources:
-        type:
-          - object
-          - "null"
+        "$ref": "#/definitions/resources"
   secrets:
     type: object
     additionalProperties: false
@@ -526,6 +514,12 @@ properties:
           - Always
           - Never
           - IfNotPresent
+  curl:
+    type: object
+    additionalProperties: false
+    properties:
+      resources:
+        "$ref": "#/definitions/resources"
   replicaCount:
     type: integer
     minimum: 0
@@ -588,6 +582,18 @@ definitions:
           - "null"
         additionalProperties:
           type: string
+  resources:
+    type: object
+    additionalProperties: false
+    properties:
+      limits:
+        type: object
+        additionalProperties:
+          type: string
+      requests:
+        type: object
+        additionalProperties:
+          type: string
   volume:
     type: object
     additionalProperties: false

diff --git a/charts/timescaledb-single/values.yaml b/charts/timescaledb-single/values.yaml
@@ -31,6 +31,19 @@ curlImage:
   tag: "7.87.0"
   pullPolicy: Always
 
+# There are job and cronjob resources that run during updates or backups that use curl image
+# Example: https://github.com/timescale/helm-charts/blob/main/charts/timescaledb-single/templates/job-update-patroni.yaml
+curl:
+  resources: {}
+    # If you do want to specify resources, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+    # limits:
+    #   cpu: 100m
+    #   memory: 128Mi
+    # requests:
+    #   cpu: 100m
+    #   memory: 128Mi
+
 # By default those secrets are randomly generated.
 # To prevent misconfiguration, modifications from helm upgrade won't be applied to those secrets.
 # As a result changing secrets cannot be done via helm and need manual intervention.