feat: chart fixes

Author: moshloop

Dockerfile

@@ -12,12 +12,10 @@ ARG BUILD_DATE=unknown
 
 # Copy source code
 WORKDIR /src/postgres
-COPY postgres/go.mod postgres/go.sum ./
-COPY clicky/go.mod /src/clicky/go.mod
+COPY go.mod go.sum ./
 RUN go mod download
 
-COPY postgres/ /src/postgres
-COPY clicky /src/clicky
+COPY . .
 # Build pgconfig binary with cache mounts and version info
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
@@ -134,7 +132,7 @@ RUN set -eux; \
 # Make volumes for data and init scripts
 VOLUME /var/lib/postgresql/data
 
-COPY postgres/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
 
@@ -156,6 +154,3 @@ USER postgres
 
 # Set entrypoint
 ENTRYPOINT ["docker-entrypoint.sh"]
-
-# Default command - run PostgreSQL
-# CMD ["postgres"]

chart/templates/statefulset.yaml

@@ -59,28 +59,38 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: {{ include "postgres.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
           command:
             - docker-entrypoint.sh
             {{- range $k, $v := .Values.conf }}
             - '--{{ $k }}={{ $v }}'
             {{- end }}
           env:
+            - name: UPGRADE_ONLY
+              value: "true"
+            - name: POSTGRES_CLI_ARGS
+              value: {{ .Values.postgresCliArgs | quote }}
             - name: PGDATA
               value: /var/lib/postgresql/data
             - name: PG_VERSION
               value: {{ .Values.version | quote }}
-            - name: UPGRADE_ONLY
-              value: "true"
             - name: POSTGRES_DB
               value: {{ .Values.database.name | quote }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $secretName }}
-                  key: {{ .Values.passwordRef.key }}
+            - name: POSTGRES_USER
+              value: {{ .Values.database.username | quote }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: /etc/postgresql/password/{{ .Values.passwordRef.key }}
+            {{- range .Values.env }}
+            - name: {{ .name }}
+              value: {{ .value | quote }}
+            {{- end }}
           volumeMounts:
             - name: data
               mountPath: /var/lib/postgresql/data
+            - name: password
+              mountPath: /etc/postgresql/password
+              readOnly: true
       {{- end }}
       containers:
         - name: postgresql
@@ -98,6 +108,8 @@ spec:
               containerPort: 5432
               protocol: TCP
           env:
+            - name: POSTGRES_CLI_ARGS
+              value: {{ .Values.postgresCliArgs | quote }}
             - name: PGDATA
               value: /var/lib/postgresql/data
             - name: PG_VERSION
@@ -106,11 +118,8 @@ spec:
               value: {{ .Values.database.name | quote }}
             - name: POSTGRES_USER
               value: {{ .Values.database.username | quote }}
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ $secretName }}
-                  key: {{ .Values.passwordRef.key }}
+            - name: POSTGRES_PASSWORD_FILE
+              value: /etc/postgresql/password/{{ .Values.passwordRef.key }}
             {{- range .Values.env }}
             - name: {{ .name }}
               value: {{ .value | quote }}
@@ -153,7 +162,9 @@ spec:
           volumeMounts:
             - name: data
               mountPath: /var/lib/postgresql/data
-
+            - name: password
+              mountPath: /etc/postgresql/password
+              readOnly: true
             - name: dshm
               mountPath: /dev/shm
             {{- if or .Values.conf .Values.custom_conf }}
@@ -165,10 +176,14 @@ spec:
             - {{- toYaml . | nindent 14 }}
             {{- end }}
       volumes:
+        - name: password
+          secret:
+            secretName: {{ $secretName }}
+            defaultMode: 0400
         - name: dshm
           emptyDir:
             medium: Memory
-            sizeLimit: 1Gi
+            sizeLimit: {{.Values.dshmSize | default "64Mi" }}
         {{- if or .Values.conf .Values.custom_conf }}
         - name: config
           configMap:

chart/values.yaml

@@ -1,18 +1,26 @@
 # Default values for postgres chart
 
+# Postgres version to run, flanksource/postgres images include multiple versions allowing you to select at runtime
+version: "17"
+# Automatic upgrade configuration
+autoUpgrade:
+  enabled: true
+
+## Change ownership and permissions of mounted volumes on startup
+resetVolumePermissions: true
+
+dshmSize: 256Mi
+
+# custom arguments to pass to postgres-cli startup
+postgresCliArgs: "--pg-tune --auto-upgrade --auto-reset-password  --auto-init"
+
 # PostgreSQL container image
 image:
   registry: ghcr.io
   repository: flanksource/postgres
   tag: "17"
   pullPolicy: IfNotPresent
 
-# Postgres version to run, flanksource/postgres images include multiple versions allowing you to select at runtime
-version: "17"
-# Automatic upgrade configuration
-autoUpgrade:
-  enabled: true
-
 # Database configuration
 database:
   name: postgres
@@ -35,7 +43,7 @@ conf:
   log_directory: "/var/log/postgresql"
   log_file_mode: 0644
   log_filename: "postgresql-%d.log"
-  log_line_prefix: "%m [%p] %q[user=%u,db=%d,app=%a] "
+  log_line_prefix: "%m [%p] %q[user=%u,db=%d,app=%a]"
   log_lock_waits: on
   log_min_duration_statement: "1s"
   # log_rotation_age: "1d"
@@ -49,24 +57,21 @@ conf:
   timezone: "UTC"
   password_encryption: scram-sha-256
 
-# Custom postgresql.conf override (takes precedence over conf)
-custom_conf: ""
-
 # Resource configuration
 resources:
   limits:
     cpu: 2000m
     memory: 4Gi
   requests:
-    cpu: 500m
-    memory: 1Gi
+    cpu: 20m
+    memory: 128Mi
 
 # Persistence configuration
 persistence:
   enabled: true
   # Name of existing PVC to use (mutually exclusive with volumeName)
   existingClaim: ""
-  # Name of existing PV to bind to (creates new PVC, mutually exclusive with existingClaim)
+  # Name of existing PV to bind to (mutually exclusive with existingClaim)
   volumeName: ""
   storageClass: ""
   accessMode: ReadWriteOnce
@@ -144,9 +149,6 @@ livenessProbe:
   failureThreshold: 3
   successThreshold: 1
 
-## Change ownership and permissions of mounted volumes on startup
-resetVolumePermissions: true
-
 # Additional environment variables
 env: []
 # - name: EXAMPLE_ENV