feat(cnpg): add values.priorityClassName (#48)

SocialGouv · Sep 25, 2023 · 2d31b01 · 2d31b01
1 parent 85c1a20
commit 2d31b01
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 1 deletion.
diff --git a/charts/cnpg-cluster/templates/cluster.cnpg.yaml b/charts/cnpg-cluster/templates/cluster.cnpg.yaml
@@ -92,6 +92,10 @@ spec:
     source: {{ .Values.replica.source }}
   {{- end }}
 
+  {{- if .Values.priorityClassName }}
+  priorityClassName: {{ .Values.priorityClassName }}
+  {{- end }}
+
   bootstrap:
     {{- if .Values.recovery.enabled }}
     recovery:

diff --git a/charts/cnpg-cluster/tests/__snapshot__/cnpg-cluster_test.yaml.snap b/charts/cnpg-cluster/tests/__snapshot__/cnpg-cluster_test.yaml.snap
@@ -6,6 +6,8 @@ cluster with custom instances:
     requests:
       cpu: 0.42
       memory: 314Mb
+  2: |
+    some-priority-class-name
 cluster with custom pg_hba:
   1: |
     parameters: null
@@ -174,7 +176,7 @@ cluster with monitoring:
         app.kubernetes.io/name: cnpg-cluster
         app.kubernetes.io/version: "15"
         cnpg.io/poolerName: RELEASE-NAME-cnpg-cluster-rw
-        helm.sh/chart: cnpg-cluster-1.12.6
+        helm.sh/chart: cnpg-cluster-1.13.0
       name: RELEASE-NAME-cnpg-cluster-rw
     spec:
       cluster:

diff --git a/charts/cnpg-cluster/tests/cnpg-cluster_test.yaml b/charts/cnpg-cluster/tests/cnpg-cluster_test.yaml
@@ -34,6 +34,9 @@ tests:
       - template: cluster.cnpg.yaml
         matchSnapshot:
           path: spec.resources
+      - template: cluster.cnpg.yaml
+        matchSnapshot:
+          path: spec.priorityClassName
   - it: cluster with custom image tag
     values:
       - ./values/tag.yaml

diff --git a/charts/cnpg-cluster/tests/values/instances.yaml b/charts/cnpg-cluster/tests/values/instances.yaml
@@ -1,4 +1,5 @@
 instances: 2
+priorityClassName: some-priority-class-name
 resources:
   requests:
     cpu: 0.42

diff --git a/charts/cnpg-cluster/values.schema.json b/charts/cnpg-cluster/values.schema.json
@@ -59,6 +59,10 @@
       "type": ["object"],
       "title": "Postgres instances labels for pod assignment"
     },
+    "priorityClassName": {
+      "type": ["string"],
+      "title": "Name of the priority class which will be used in every generated Pod, if the PriorityClass specified does not exist, the pod will not be able to schedule. Please refer to https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass for more information"
+    },
     "tolerations": {
       "type": ["array"],
       "title": "Postgres instances labels for tolerations pod assignment"

diff --git a/charts/cnpg-cluster/values.yaml b/charts/cnpg-cluster/values.yaml
@@ -54,6 +54,10 @@ resources:
 # @param {object} [nodeSelector] Postgres instances labels for pod assignment
 nodeSelector: {}
 
+# Name of the priority class which will be used in every generated Pod, if the PriorityClass specified does not exist, the pod will not be able to schedule. Please refer to https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#priorityclass for more information
+# @param {string} [priorityClassName] Name of the priority class which will be used in every generated Pod
+priorityClassName: ""
+
 # @param {array} [tolerations] Postgres instances labels for tolerations pod assignment
 tolerations: []