diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
index feaaad825579b821a8afa1cfc53c5d1876275864..fd3cf305b202f5e94d53f14d39ab873bca83dbca 100644
--- a/charts/postgres/Chart.yaml
+++ b/charts/postgres/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.2.0
+version: 0.2.1
appVersion: "13.1"
diff --git a/charts/postgres/README.md b/charts/postgres/README.md
index 5328d3d023ea0bfab0874db289f0bba9e9afb167..5f0031f0b2c9e024fcf0a97c7a9612c92fca58fb 100644
--- a/charts/postgres/README.md
+++ b/charts/postgres/README.md
@@ -1,6 +1,6 @@
# PostgreSQL
-  
+  
A Helm chart for PostgreSQL on Kubernetes
@@ -58,11 +58,12 @@ $ helm uninstall my-release
| livenessProbe | object | `see values.yaml` | Liveness probe configuration |
| readinessProbe | object | `see values.yaml` | Readiness probe configuration |
| resources | object | `{}` | Resource limits and requests |
-| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | Deployment node selector |
+| nodeSelector | object | `{}` | Deployment node selector |
| podAnnotations | object | `{}` | Additional pod annotations |
| podSecurityContext | object | `see values.yaml` | Pod security context |
| securityContext | object | `see values.yaml` | Container security context |
| env | list | `[]` | Additional container environmment variables |
+| args | string | `[]` | Arguments for the container entrypoint process |
| serviceAccount.annotations | object | `{}` | Additional service account annotations |
| serviceAccount.create | bool | `false` | Enable service account creation |
| serviceAccount.name | string | `""` | Name of the service account |
@@ -80,16 +81,15 @@ $ helm uninstall my-release
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| storage.accessModes[0] | string | `"ReadWriteOnce"` | Storage access mode |
-| storage.persistentVolumeClaimName | string | `""` | PVC name when existing storage volume should be used |
-| storage.requestedSize | string | `""` | Size for new PVC, when no existing PVC is used |
-| storage.className | string | `""` | Storage class name |
+| storage.persistentVolumeClaimName | string | `nil` | PVC name when existing storage volume should be used |
+| storage.requestedSize | string | `nil` | Size for new PVC, when no existing PVC is used |
+| storage.className | string | `nil` | Storage class name |
## PostgreSQL parameters
| Key | Type | Default | Description |
|-----|------|---------|-------------|
-| arguments | string | `nil` | Arguments for the container entrypoint process |
-| customConfig | string | `""` | Optional custom configuration block that will be mounted as file in /etc/postgresql/postgresql.conf |
+| customConfig | string | `nil` | Optional custom configuration block that will be mounted as file in /etc/postgresql/postgresql.conf |
| settings.authMethod | string | `"md5"` | Postgres database authentication method |
| settings.initDbArgs | string | `nil` | Optional init database arguments |
| settings.superuserPassword | string | `nil` | Password of superuser (Random value if not specified) |
diff --git a/charts/postgres/templates/service.yaml b/charts/postgres/templates/service.yaml
index 0fb3124305c46966acabd612077303307a9cb888..8548ec64f3c9187a0040955462d4f9ae8d8b7251 100644
--- a/charts/postgres/templates/service.yaml
+++ b/charts/postgres/templates/service.yaml
@@ -5,11 +5,17 @@ metadata:
labels:
{{- include "postgres.labels" . | nindent 4 }}
spec:
- clusterIP: None
+ type: {{ .Values.service.type }}
ports:
- port: {{ .Values.service.port }}
targetPort: postgres
protocol: TCP
name: postgres
+ {{- if and (eq .Values.service.type "NodePort") (.Values.service.nodePort) }}
+ nodePort: {{ .Values.service.nodePort }}
+ {{- end }}
+ {{- if and (eq .Values.service.type "LoadBalancer") (.Values.service.clusterIP) }}
+ clusterIP: {{ .Values.service.clusterIP }}
+ {{- end }}
selector:
{{- include "postgres.selectorLabels" . | nindent 4 }}
diff --git a/charts/postgres/templates/statefulset.yaml b/charts/postgres/templates/statefulset.yaml
index 35d53d4e106a7821dcb9279dfa5ee719ec018be1..3bd25ab72e7d2d02a07530b728b22d14eabe8cd5 100644
--- a/charts/postgres/templates/statefulset.yaml
+++ b/charts/postgres/templates/statefulset.yaml
@@ -24,12 +24,16 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "postgres.serviceAccountName" . }}
+ {{- with .Values.podSecurityContext }}
securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: {{ .Chart.Name }}
+ {{- with .Values.securityContext }}
securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
@@ -79,11 +83,13 @@ spec:
periodSeconds: {{ .periodSeconds }}
{{- end }}
{{- end }}
+ {{- with .Values.resources }}
resources:
- {{- toYaml .Values.resources | nindent 12 }}
- {{- if .Values.arguments }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
+ {{- if .Values.args }}
args:
- {{- range .Values.arguments }}
+ {{- range .Values.args }}
- {{ . }}
{{- end }}
{{- end }}
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
index 044532c7f7f888cb342a8aa87c85e380750f8ec0..ca05d316f5e9ddf7fb2a267c659b917e786271c0 100644
--- a/charts/postgres/values.yaml
+++ b/charts/postgres/values.yaml
@@ -40,7 +40,12 @@ securityContext:
## The postgres service configuration (Default is ClusterIP with port 5432)
service:
+ type: ClusterIP
port: 5432
+ ## The node port (only relevant for type NodePort)
+ nodePort: {}
+ ## The cluster ip address (only relevant for type LoadBalancer)
+ clusterIP: {}
resources: {}
# limits:
@@ -50,10 +55,8 @@ resources: {}
# cpu: 100m
# memory: 128Mi
-## Default node type for the image
-## use arm64 for arm64v8
-nodeSelector:
- kubernetes.io/arch: amd64
+## Additional node selector
+nodeSelector: {}
tolerations: []
@@ -81,7 +84,7 @@ readinessProbe:
env: []
## Arguments for the container entrypoint process
-arguments:
+args: []
## Database configuration
settings:
@@ -111,13 +114,13 @@ customConfig: |-
## Storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}
## Default access mode (ReadWriteOnce)
accessModes: