by default, use lowest postgres version CL node is compatible with = 12.0

Tofel · Tofel · commit 9e41021139d0 · 2024-11-25T10:58:38.000+01:00
diff --git a/book/src/framework/nodeset_capabilities.md b/book/src/framework/nodeset_capabilities.md
@@ -27,7 +27,7 @@ Create a configuration file `smoke.toml`
   override_mode = "all"
   
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/cmd/interactive.go b/framework/cmd/interactive.go
@@ -62,7 +62,7 @@ func createComponentsFromForm(form *nodeSetForm) error {
 				Nodes:        5,
 				OverrideMode: "all",
 				DbInput: &postgres.Input{
-					Image: "postgres:15.6",
+					Image: "postgres:12.0",
 				},
 				NodeSpecs: nspecs,
 			}, bc)
diff --git a/framework/examples/myproject/chaos.toml b/framework/examples/myproject/chaos.toml
@@ -13,7 +13,7 @@
   override_mode = "all"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/examples/myproject/fake.toml b/framework/examples/myproject/fake.toml
@@ -13,7 +13,7 @@
   override_mode = "all"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/examples/myproject/fork_plus_offchain.toml b/framework/examples/myproject/fork_plus_offchain.toml
@@ -21,7 +21,7 @@
   override_mode = "all"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/examples/myproject/performance_baseline.toml b/framework/examples/myproject/performance_baseline.toml
@@ -13,7 +13,7 @@
   override_mode = "all"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/examples/myproject/scalability.toml b/framework/examples/myproject/scalability.toml
@@ -13,7 +13,7 @@
   override_mode = "all"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/examples/myproject/smoke.toml b/framework/examples/myproject/smoke.toml
@@ -13,7 +13,7 @@
   override_mode = "all"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/framework/examples/myproject/upgrade.toml b/framework/examples/myproject/upgrade.toml
@@ -13,7 +13,7 @@
   override_mode = "each"
 
   [nodeset.db]
-    image = "postgres:15.6"
+    image = "postgres:12.0"
 
   [[nodeset.node_specs]]
 
diff --git a/lib/charts/chainlink/values.yaml b/lib/charts/chainlink/values.yaml
@@ -14,7 +14,7 @@ chainlink:
 db:
   image:
     image: postgres
-    version: 12.18
+    version: 12.0
   stateful: true
   capacity: 1Gi
   resources:
diff --git a/lib/docker/test_env/postgres.go b/lib/docker/test_env/postgres.go
@@ -26,7 +26,7 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 )
 
-const defaultPostgresImage = "postgres:15.6"
+const defaultPostgresImage = "postgres:12.0"
 
 type PostgresDb struct {
 	EnvComponent
diff --git a/lib/docker/test_env/postgres_test.go b/lib/docker/test_env/postgres_test.go
@@ -24,7 +24,7 @@ func TestPostgresCustomImageVersionNotInMirror(t *testing.T) {
 	require.NoError(t, err)
 }
 
-func TestPostgresWithMirror(t *testing.T) {
+func TestPostgresLowestCompatibleVersion(t *testing.T) {
 	// requires internal docker repo to be set
 	if os.Getenv(config.EnvVarInternalDockerRepo) == "" {
 		t.Skipf("Skipping test because %s is not set", config.EnvVarInternalDockerRepo)
@@ -38,3 +38,19 @@ func TestPostgresWithMirror(t *testing.T) {
 	err = pg.StartContainer()
 	require.NoError(t, err)
 }
+
+func TestPostgresModernVersion(t *testing.T) {
+	// requires internal docker repo to be set
+	if os.Getenv(config.EnvVarInternalDockerRepo) == "" {
+		t.Skipf("Skipping test because %s is not set", config.EnvVarInternalDockerRepo)
+	}
+	l := logging.GetTestLogger(t)
+	network, err := docker.CreateNetwork(l)
+	require.NoError(t, err)
+
+	pgOpt := WithPostgresImageVersion("15.6")
+	pg, err := NewPostgresDb([]string{network.Name}, pgOpt)
+	require.NoError(t, err)
+	err = pg.StartContainer()
+	require.NoError(t, err)
+}
diff --git a/lib/k8s/examples/simple_toml/env_toml_config.go b/lib/k8s/examples/simple_toml/env_toml_config.go
@@ -14,8 +14,8 @@ func main() {
 	// in actual implementation here you should read the config from TOML file instead of creating structs manually
 	chainlinkConfig := ctf_config.ChainlinkImageConfig{
 		Image:           ptr.Ptr("public.ecr.aws/chainlink/chainlink"),
-		Version:         ptr.Ptr("v2.8.0"),
-		PostgresVersion: ptr.Ptr("15.6"),
+		Version:         ptr.Ptr("2.18.0"),
+		PostgresVersion: ptr.Ptr("12.0"),
 	}
 
 	pyroscope := ctf_config.PyroscopeConfig{
diff --git a/lib/k8s/pkg/helm/chainlink/chainlink.go b/lib/k8s/pkg/helm/chainlink/chainlink.go
@@ -150,7 +150,7 @@ func defaultProps() map[string]any {
 		"db": map[string]any{
 			"image": map[string]any{
 				"image":   postgresImage,
-				"version": "12.18",
+				"version": "12.0",
 			},
 			"stateful":                         false,
 			"enablePrometheusPostgresExporter": false,
