Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrering til Postgres 15 #162

Merged
merged 9 commits into from
Jul 5, 2024
Merged

Migrering til Postgres 15 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0c203f
Oppgrader til Java 21
klaramargrethehelgemo May 13, 2024
25bcf69
Migrerer databasen i dev til pg15
klaramargrethehelgemo Jul 2, 2024
c363e67
Merge remote-tracking branch 'origin/master' into postgres-15
klaramargrethehelgemo Jul 2, 2024
0573a9a
Migrerer databasen i dev til pg15
klaramargrethehelgemo Jul 3, 2024
75f57dd
Migrerer databasen i dev til pg15
klaramargrethehelgemo Jul 3, 2024
76d88fb
Migrerer databasen i dev til pg15
klaramargrethehelgemo Jul 3, 2024
c0c6320
Forklarende tekst i Readme
klaramargrethehelgemo Jul 3, 2024
c1966e6
Forbereder appen for å kopiere data fra gammel til ny db i prod
klaramargrethehelgemo Jul 5, 2024
04f9739
Merge branch 'dev' into postgres-15
klaramargrethehelgemo Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .nais/application/application-config-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ metadata:
spec:
image: {{image}}
replicas:
min: 2
max: 4
min: 0
max: 0
cpuThresholdPercentage: 75
port: 8080
webproxy: true
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/no/nav/veilarboppgave/util/DbUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static HikariConfig createDataSourceConfig(String dbUrl) {
@SneakyThrows
private static DataSource createVaultRefreshDataSource(HikariConfig config) {
String environment = isProduction().orElse(false) ? "prod" : "dev";
String role = isProduction().orElse(false) ? String.join("-", APPLICATION_NAME, environment, "admin") : String.join("-", APPLICATION_NAME, "pg15", environment, "admin") ;
String role = String.join("-", APPLICATION_NAME, "pg15", environment, "admin");

return HikariCPVaultUtil.createHikariDataSourceWithVaultIntegration(config, getMountPath(), role);
}
Expand Down