Adds serviceAccountTemplate to cluster configuration (cloudnative-pg#463

) Signed-off-by: Dariusch Ochlast <[email protected]> Signed-off-by: Itay Grudev <[email protected]> Co-authored-by: Dariusch Ochlast <[email protected]>
yremmet · Dec 9, 2024 · 18fc19f · 18fc19f
1 parent 3f15995
commit 18fc19f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/charts/cluster/README.md b/charts/cluster/README.md
@@ -186,7 +186,11 @@ refer to  the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
 | cluster.projectedVolumeSources| list | `[]` | Configure Projected Volumes from Secrets / ConfigMaps. See: https://cloudnative-pg.io/documentation/1.24/cluster_conf/#projected-volumes |
 | 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.roles | list | `[]` | This feature enables declarative management of existing roles, as well as the creation of new roles if they are not already present in the database. See: https://cloudnative-pg.io/documentation/current/declarative_role_management/ |
+<<<<<<< HEAD
 | cluster.services | object | `{}` | Customization of service definions. Please refer to https://cloudnative-pg.io/documentation/1.24/service_management/ |
+=======
+| cluster.serviceAccountTemplate | object | `{}` | Configure the metadata of the generated service account |
+>>>>>>> b849139 (Adds serviceAccountTemplate to cluster configuration (#463))
 | cluster.storage.size | string | `"8Gi"` |  |
 | cluster.storage.storageClass | string | `""` |  |
 | cluster.superuserSecret | string | `""` |  |

diff --git a/charts/cluster/templates/cluster.yaml b/charts/cluster/templates/cluster.yaml
@@ -87,6 +87,11 @@ spec:
       {{- toYaml . | nindent 6 }}
     {{ end }}
 
+  {{- with .Values.cluster.serviceAccountTemplate }}
+  serviceAccountTemplate:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+
   monitoring:
     enablePodMonitor: {{ and .Values.cluster.monitoring.enabled .Values.cluster.monitoring.podMonitor.enabled }}
     disableDefaultQueries: {{ .Values.cluster.monitoring.disableDefaultQueries }}

diff --git a/...er/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml b/...er/test/postgresql-cluster-configuration/01-non_default_configuration_cluster-assert.yaml
@@ -80,3 +80,7 @@ spec:
         inRoles:
           - pg_monitor
           - pg_signal_backend
+  serviceAccountTemplate:
+    metadata:
+      annotations:
+        my-annotation: my-service-account
diff --git a/...s/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml b/...s/cluster/test/postgresql-cluster-configuration/01-non_default_configuration_cluster.yaml
@@ -76,6 +76,10 @@ cluster:
     foo: bar
   annotations:
     foo: bar
+  serviceAccountTemplate:
+    metadata:
+      annotations:
+        my-annotation: my-service-account
 
 backups:
   enabled: false
diff --git a/charts/cluster/values.schema.json b/charts/cluster/values.schema.json
@@ -300,7 +300,11 @@
                 "roles": {
                     "type": "array"
                 },
+<<<<<<< HEAD
                 "services": {
+=======
+                "serviceAccountTemplate": {
+>>>>>>> b849139 (Adds serviceAccountTemplate to cluster configuration (#463))
                     "type": "object"
                 },
                 "storage": {

diff --git a/charts/cluster/values.yaml b/charts/cluster/values.yaml
@@ -313,6 +313,9 @@ cluster:
     # postInitApplicationSQL: []
     # postInitTemplateSQL: []
 
+  # -- Configure the metadata of the generated service account
+  serviceAccountTemplate: {}
+
   additionalLabels: {}
   annotations: {}