Skip to content

Commit f77c501

Browse files
authored
[Fix-4290] Sync the helm configuration with src/main/resources directory (#4332)
1 parent f430c80 commit f77c501

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

deploy/kubernetes/helm/dinky/conf/application-flyway.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ spring:
2525
table: _dinky_flyway_schema_history
2626
placeholder-replacement: false # Placeholder Replacement
2727
baseline-on-migrate: true # Baseline during migration
28-
baseline-version: 1.0.2 # Baseline version
28+
baseline-version: 20240506.1.0.2 # Baseline version
2929
validate-on-migrate: false # Verify during migration
3030
placeholder-prefix: '##{'
3131
placeholder-suffix: '}##'
3232
fail-on-missing-locations: true # Does the non-existent migration file throw an exception
33-
33+
clean-disabled: true

deploy/kubernetes/helm/dinky/conf/application-h2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
spring:
1919
datasource:
2020
driver-class-name: org.h2.Driver
21-
url: jdbc:h2:mem:dinky;MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;
21+
url: jdbc:h2:${H2_DB:mem:dinky};MODE=MySQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=true;
2222
# Note: Since dinky version 1.1.0, Flyway has been integrated, so h2 defaults to memory mode and no longer uses file mode (persistence).
2323
# File mode can cause Flyway to fail to execute duplicate column addition operations correctly
2424
# as h2 does not support stored procedures and cannot determine the existence of columns through stored procedures. Therefore, please do not use file mode

deploy/kubernetes/helm/dinky/conf/application.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ spring:
1111
application:
1212
name: Dinky
1313
profiles:
14-
# The h2 database is used by default. If you need to use other databases, please set the configuration active to: mysql, currently supports [mysql, pgsql, h2]
14+
# The h2 database is used by default. If you need to use other databases, please set the configuration active to: mysql, currently supports [mysql, postgresql, h2]
1515
# If you use mysql database, please configure mysql database connection information in application-mysql.yml
16-
# If you use pgsql database, please configure pgsql database connection information in application-pgsql.yml
16+
# If you use postgresql database, please configure pgsql database connection information in application-postgresql.yml
1717
# If you use the h2 database, please configure the h2 database connection information in application-h2.yml,
1818
# note: the h2 database is only for experience use, and the related data that has been created cannot be migrated, please use it with caution
19-
active: ${DB_ACTIVE:h2} #[h2,mysql,pgsql]
19+
active: ${DB_ACTIVE:h2} #[h2,mysql,postgresql]
2020
include:
2121
- jmx
2222
- flyway
@@ -145,7 +145,7 @@ sa-token:
145145
is-write-header: true
146146
# is read header
147147
is-read-header: true
148-
token-name: token
148+
token-name: dinky-token
149149
is-read-cookie: true
150150

151151
---

0 commit comments

Comments
 (0)