diff --git a/docker-compose.yaml b/docker-compose.yaml index 5078640..3b733fb 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -14,7 +14,7 @@ services: db: - image: postgres:13 + image: postgres:12 hostname: ${POSTGRES_DB} environment: POSTGRES_USER: ${POSTGRES_USER} @@ -23,7 +23,7 @@ services: ports: - "5432:5432" volumes: - - pgdata:/var/lib/postgresql/data + - pgdata:/home/postgres/pgdata volumes: pgdata: diff --git a/helm/templates/statefulset.yaml b/helm/templates/statefulset.yaml deleted file mode 100644 index d204eb4..0000000 --- a/helm/templates/statefulset.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ .Release.Name }}-postgresql - labels: - app: {{ .Release.Name }}-postgresql -spec: - replicas: 1 - serviceName: {{ .Release.Name }}-postgresql - selector: - matchLabels: - app: {{ .Release.Name }}-postgresql - securityContext: - fsGroup: 1007250000 - template: - metadata: - labels: - app: {{ .Release.Name }}-postgresql - spec: - containers: - - name: postgresql - image: "{{ .Values.postgresql.image.repository }}:{{ .Values.postgresql.image.tag }}" - securityContext: - runAsUser: 1007250000 - ports: - - containerPort: {{ .Values.service.postgresPort }} - env: - - name: POSTGRES_USER - value: {{ .Values.postgresql.username }} - - name: POSTGRES_PASSWORD - value: {{ .Values.postgresql.password }} - - name: POSTGRES_DB - value: {{ .Values.postgresql.database }} - volumeMounts: - - name: data - mountPath: /var/lib/postgresql/data - volumeClaimTemplates: - - metadata: - name: data - spec: - accessModes: {{- toYaml .Values.postgresql.primary.persistence.accessModes | nindent 8 }} - resources: - requests: - storage: {{ .Values.postgresql.primary.persistence.size }} - storageClassName: {{ .Values.postgresql.primary.persistence.storageClassName | quote }} diff --git a/helm/values.yaml b/helm/values.yaml index 1f1a58e..aab1258 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1,10 +1,5 @@ replicaCount: 1 -image: - repository: postgres - tag: "13" - pullPolicy: IfNotPresent - configMapName: template-repo-config secretName: template-repo-app-secrets @@ -25,23 +20,23 @@ resources: cpu: "250m" postgresql: - enabled: true - image: - repository: postgres - tag: "13" - username: postgres - password: postgres - database: form_templates - primary: - persistence: - enabled: true - size: 512Mi - accessModes: - - ReadWriteOnce - storageClassName: netapp-file-standard + enabled: false + external: + host: template-repo-patroni + port: 5432 + usernameFrom: + secretKeyRef: + name: template-repo-patroni + key: app-db-username + passwordFrom: + secretKeyRef: + name: template-repo-patroni + key: app-db-password + databaseFrom: + secretKeyRef: + name: template-repo-patroni + key: app-db-name service: type: ClusterIP - postgresPort: 5432 appPort: 3000 -