Update scema.sql

This commit is contained in:
dvirlabs 2026-01-05 21:59:34 +02:00
parent d020819ec0
commit 0b9fd670b9
2 changed files with 12 additions and 47 deletions

View File

@ -30,7 +30,9 @@ spec:
echo "Database not ready, waiting..." echo "Database not ready, waiting..."
sleep 2 sleep 2
done done
echo "Database is ready, running migration..." echo "Database is ready, applying schema..."
PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f /schema/schema.sql
echo "Schema applied, running migrations..."
PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f /migration/migrate.sql PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER -d $DB_NAME -f /migration/migrate.sql
echo "Migration completed successfully" echo "Migration completed successfully"
env: env:
@ -62,8 +64,12 @@ spec:
volumeMounts: volumeMounts:
- name: migration-script - name: migration-script
mountPath: /migration mountPath: /migration
- name: schema-script
mountPath: /schema
volumes: volumes:
- name: migration-script - name: migration-script
configMap: configMap:
name: {{ .Release.Name }}-db-migration name: {{ .Release.Name }}-db-migration
- name: schema-script
configMap:
name: {{ .Release.Name }}-db-schema

View File

@ -2,11 +2,10 @@
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ .Release.Name }}-frontend name: {{ .Release.Name }}
namespace: {{ .Values.global.namespace }} namespace: {{ .Values.global.namespace }}
labels: labels:
app: {{ .Release.Name }}-frontend app: {{ .Release.Name }}
component: frontend
{{- with .Values.frontend.ingress.annotations }} {{- with .Values.frontend.ingress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
@ -16,6 +15,7 @@ spec:
ingressClassName: {{ .Values.frontend.ingress.className }} ingressClassName: {{ .Values.frontend.ingress.className }}
{{- end }} {{- end }}
rules: rules:
# Frontend rule
{{- range .Values.frontend.ingress.hosts }} {{- range .Values.frontend.ingress.hosts }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
@ -30,38 +30,7 @@ spec:
number: {{ $.Values.frontend.service.port }} number: {{ $.Values.frontend.service.port }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.frontend.ingress.tls }} # Backend API rule
tls:
{{- range .Values.frontend.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
{{- end }}
---
{{- if .Values.backend.ingress.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ .Release.Name }}-backend
namespace: {{ .Values.global.namespace }}
labels:
app: {{ .Release.Name }}-backend
component: backend
{{- with .Values.backend.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- if .Values.backend.ingress.className }}
ingressClassName: {{ .Values.backend.ingress.className }}
{{- end }}
rules:
{{- range .Values.backend.ingress.hosts }} {{- range .Values.backend.ingress.hosts }}
- host: {{ .host | quote }} - host: {{ .host | quote }}
http: http:
@ -76,14 +45,4 @@ spec:
number: {{ $.Values.backend.service.port }} number: {{ $.Values.backend.service.port }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .Values.backend.ingress.tls }}
tls:
{{- range .Values.backend.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
{{- end }} {{- end }}