Skip to content

Commit db27832

Browse files
committed
fix: Added PostgreSQL 18.0
1 parent b04e4ad commit db27832

6 files changed

Lines changed: 18 additions & 2 deletions

File tree

stackgres-k8s/src/common/src/main/resources/versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ postgresql=\
2525
15.7-build-6.37,15.8-build-6.39,15.10-build-6.41,15.12-build-6.41,15.13-build-6.42,15.14-build-6.44,\
2626
16.0-build-6.30,16.1-build-6.31,16.2-build-6.35,16.3-build-6.37,16.4-build-6.39,16.6-build-6.41,16.8-build-6.41,\
2727
16.9-build-6.42,16.10-build-6.44,\
28-
17.0-build-6.37,17.2-build-6.39,17.4-build-6.41,17.5-build-6.42,17.6-build-6.44,
28+
17.0-build-6.37,17.2-build-6.39,17.4-build-6.41,17.5-build-6.42,17.6-build-6.44,\
2929
18.0-build-6.44
3030
babelfish=\
3131
13.6-build-6.17,13.9-build-6.42,\

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigEndpoints.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,10 @@ Map<String, String> getPostgresRecoveryConfigValues(
283283

284284
private Map<String, String> normalizeParams(String postgresVersion,
285285
Map<String, String> params) {
286+
// TODO: Update when dependency update is available
287+
if (postgresVersion.equals("18")) {
288+
return Map.copyOf(params);
289+
}
286290
final GucValidator val = GucValidator.forVersion(postgresVersion);
287291
final var builder = ImmutableMap.<String, String>builderWithExpectedSize(params.size());
288292
params.forEach((name, setting) -> {

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigNormalizeValuesMutator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ private Map<String, String> normalizeParams(
4747
if (params.size() == 0) {
4848
return Map.of();
4949
}
50+
// TODO: Update when dependency update is available
51+
if (postgresVersion.equals("18")) {
52+
return Map.copyOf(params);
53+
}
5054
final GucValidator val = GucValidator.forVersion(postgresVersion.split("\\.")[0]);
5155
Map<String, String> updatedParams = new HashMap<>(params);
5256
params.forEach((name, setting) -> {

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PgConfigParametersValidator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public void validate(StackGresClusterReview review) throws ValidationFailed {
4949
final Map<String, String> postgresqlConf = conf.getPostgresqlConf();
5050
final String postgresVersion =
5151
review.getRequest().getObject().getSpec().getPostgres().getVersion().split("\\.")[0];
52+
// TODO: Update when dependency update is available
53+
if (postgresVersion.equals("18")) {
54+
return;
55+
}
5256
final GucValidator val = GucValidator.forVersion(postgresVersion);
5357
StatusDetailsBuilder detailsBuilder = new StatusDetailsBuilder();
5458
postgresqlConf.entrySet().stream()

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigParametersValidator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ public void validate(StackGresPostgresConfigReview review) throws ValidationFail
4141
final StackGresPostgresConfig conf = review.getRequest().getObject();
4242
final Map<String, String> postgresqlConf = conf.getSpec().getPostgresqlConf();
4343
final String postgresVersion = conf.getSpec().getPostgresVersion().split("\\.")[0];
44+
// TODO: Update when dependency update is available
45+
if (postgresVersion.equals("18")) {
46+
return;
47+
}
4448
final GucValidator val = GucValidator.forVersion(postgresVersion);
4549
StatusDetailsBuilder detailsBuilder = new StatusDetailsBuilder();
4650
postgresqlConf.entrySet().stream()

stackgres-k8s/src/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<jsonassert.version>1.5.3</jsonassert.version>
105105
<commons-configuration2.version>2.12.0</commons-configuration2.version>
106106
<org.tukaani.xz.version>1.10</org.tukaani.xz.version>
107-
<pgconfig-validator.version>1.6.0</pgconfig-validator.version>
107+
<pgconfig-validator.version>1.7.0</pgconfig-validator.version>
108108
<auto-service.version>1.1.1</auto-service.version>
109109
<javapoet.version>1.13.0</javapoet.version>
110110
<compile-testing.version>0.21.0</compile-testing.version>

0 commit comments

Comments
 (0)