futureporn
/
fp
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

use postgres-primary url
ci / build (push) Failing after 1m56s Details

This commit is contained in:
CJ_Clippy 2024-07-16 23:27:23 -08:00
parent 18ea1267b4
commit 3c04266d58
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tiltfile
View File

@ -447,12 +447,12 @@ helm_remote(
'server.config.persistence.default.sql.existingSecret=postgres', 'server.config.persistence.default.sql.existingSecret=postgres',
'server.config.persistence.default.sql.secretName=postgres', 'server.config.persistence.default.sql.secretName=postgres',
'server.config.persistence.default.sql.secretKey=password', 'server.config.persistence.default.sql.secretKey=password',
'server.config.persistence.default.sql.host=postgres.futureporn.svc.cluster.local', 'server.config.persistence.default.sql.host=postgresql-primary.futureporn.svc.cluster.local',
'server.config.persistence.default.sql.port=5432', 'server.config.persistence.default.sql.port=5432',
'server.config.persistence.default.sql.user=postgres', 'server.config.persistence.default.sql.user=postgres',
'server.config.persistence.visibility.driver=sql', 'server.config.persistence.visibility.driver=sql',
'server.config.persistence.visibility.sql.driver=postgres12', 'server.config.persistence.visibility.sql.driver=postgres12',
'server.config.persistence.visibility.sql.host=postgres.futureporn.svc.cluster.local', 'server.config.persistence.visibility.sql.host=postgresql-primary.futureporn.svc.cluster.local',
'server.config.persistence.visibility.sql.port=5432', 'server.config.persistence.visibility.sql.port=5432',
'server.config.persistence.visibility.sql.user=postgres', 'server.config.persistence.visibility.sql.user=postgres',
'server.config.persistence.visibility.sql.existingSecret=postgres', 'server.config.persistence.visibility.sql.existingSecret=postgres',

2
charts/fp/templates/strapi.yaml
View File

@ -61,7 +61,7 @@ spec:
- name: DATABASE_CLIENT - name: DATABASE_CLIENT
value: postgres value: postgres
- name: DATABASE_HOST - name: DATABASE_HOST
value: postgres.futureporn.svc.cluster.local value: postgresql-primary.futureporn.svc.cluster.local
- name: DATABASE_NAME - name: DATABASE_NAME
value: futureporn-strapi value: futureporn-strapi
- name: JWT_SECRET - name: JWT_SECRET

4
flux/apps/base/temporal/release.yaml
View File

@ -43,14 +43,14 @@ spec:
driver: sql driver: sql
sql: sql:
driver: postgres12 driver: postgres12
host: postgres.futureporn.svc.cluster.local host: postgresql-primary.futureporn.svc.cluster.local
port: 5432 port: 5432
user: postgres user: postgres
visibility: visibility:
driver: sql driver: sql
sql: sql:
driver: postgres12 driver: postgres12
host: postgres.futureporn.svc.cluster.local host: postgresql-primary.futureporn.svc.cluster.local
port: 5432 port: 5432
user: postgres user: postgres
valuesFrom: valuesFrom:

4
scripts/k8s-secrets.sh
View File

@ -125,6 +125,8 @@ kubectl --namespace futureporn create secret generic vultr \
kubectl --namespace futureporn delete secret postgres --ignore-not-found kubectl --namespace futureporn delete secret postgres --ignore-not-found
kubectl --namespace futureporn create secret generic postgres \ kubectl --namespace futureporn create secret generic postgres \
--from-literal=replication-password=${POSTGRES_PASSWORD} \
--from-literal=postgres-password=${POSTGRES_PASSWORD} \
--from-literal=password=${POSTGRES_PASSWORD} --from-literal=password=${POSTGRES_PASSWORD}
kubectl --namespace futureporn delete secret pgadmin --ignore-not-found kubectl --namespace futureporn delete secret pgadmin --ignore-not-found
@ -137,7 +139,7 @@ kubectl --namespace futureporn create secret generic strapi \
--from-literal=adminJwtSecret=${STRAPI_ADMIN_JWT_SECRET} \ --from-literal=adminJwtSecret=${STRAPI_ADMIN_JWT_SECRET} \
--from-literal=apiTokenSalt=${STRAPI_API_TOKEN_SALT} \ --from-literal=apiTokenSalt=${STRAPI_API_TOKEN_SALT} \
--from-literal=appKeys=${STRAPI_APP_KEYS} \ --from-literal=appKeys=${STRAPI_APP_KEYS} \
--from-literal=databaseUrl=postgres.futureporn.svc.cluster.local://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} \ --from-literal=databaseUrl=postgresql-primary.futureporn.svc.cluster.local://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} \
--from-literal=jwtSecret=${STRAPI_JWT_SECRET} \ --from-literal=jwtSecret=${STRAPI_JWT_SECRET} \
--from-literal=muxPlaybackRestrictionId=${MUX_PLAYBACK_RESTRICTION_ID} \ --from-literal=muxPlaybackRestrictionId=${MUX_PLAYBACK_RESTRICTION_ID} \
--from-literal=muxSigningKeyPrivateKey=${MUX_SIGNING_KEY_PRIVATE_KEY} \ --from-literal=muxSigningKeyPrivateKey=${MUX_SIGNING_KEY_PRIVATE_KEY} \

2
scripts/pgadmin-connection-profile.json
View File

@ -3,7 +3,7 @@
"1": { "1": {
"Name": "futureporn", "Name": "futureporn",
"Group": "Servers", "Group": "Servers",
"Host": "postgres.futureporn.svc.cluster.local", "Host": "postgresql-primary.futureporn.svc.cluster.local",
"Port": 5432, "Port": 5432,
"MaintenanceDB": "postgres", "MaintenanceDB": "postgres",
"Username": "postgres", "Username": "postgres",