Add support for PG15

.github/workflows/go-e2e.yml

@@ -34,6 +34,7 @@ jobs:
       docker_image_12:  ${{ steps.metadata.outputs.docker_image_12 }}
       docker_image_13:  ${{ steps.metadata.outputs.docker_image_13 }}
       docker_image_14:  ${{ steps.metadata.outputs.docker_image_14 }}
+      docker_image_15:  ${{ steps.metadata.outputs.docker_image_15 }}
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v3
@@ -55,6 +56,7 @@ jobs:
           docker_image_12=$(echo ${{inputs.docker_image_prefix}}-pg12)
           docker_image_13=$(echo ${{inputs.docker_image_prefix}}-pg13)
           docker_image_14=$(echo ${{inputs.docker_image_prefix}}-pg14)
+          docker_image_15=$(echo ${{inputs.docker_image_prefix}}-pg15)
         else
           branch_name=$(echo ${{github.head_ref || github.ref_name}} | sed 's#/#-#')
           possible_branch_tag=$(echo ${branch_name}-ts2)
@@ -64,10 +66,12 @@ jobs:
           docker_image_12=$(./scripts/fallback-docker.sh ${image_base}:${possible_branch_tag}-pg12 ${image_base}:${stable_branch_tag}-pg12)
           docker_image_13=$(./scripts/fallback-docker.sh ${image_base}:${possible_branch_tag}-pg13 ${image_base}:${stable_branch_tag}-pg13)
           docker_image_14=$(./scripts/fallback-docker.sh ${image_base}:${possible_branch_tag}-pg14 ${image_base}:${stable_branch_tag}-pg14)
+          docker_image_15=$(./scripts/fallback-docker.sh ${image_base}:${possible_branch_tag}-pg15 ${image_base}:${stable_branch_tag}-pg15)
         fi;
         echo "docker_image_12=${docker_image_12}" >> ${GITHUB_OUTPUT}
         echo "docker_image_13=${docker_image_13}" >> ${GITHUB_OUTPUT}
         echo "docker_image_14=${docker_image_14}" >> ${GITHUB_OUTPUT}
+        echo "docker_image_15=${docker_image_15}" >> ${GITHUB_OUTPUT}
 
   test-end-to-end:
     name: e2e
@@ -76,6 +80,7 @@ jobs:
     strategy:
       matrix:
         test-setups:
+        - {name: "Singlenode (15)", shortname: "singlenode-15", multi: false, pg: 15}
         - {name: "Singlenode (14)", shortname: "singlenode-14", multi: false, pg: 14}
         - {name: "Singlenode (13)", shortname: "singlenode-13", multi: false, pg: 13}
         - {name: "Singlenode (12)", shortname: "singlenode-12", multi: false, pg: 12}
@@ -126,6 +131,7 @@ jobs:
     strategy:
       matrix:
         test-setups:
+        - {name: "Singlenode (15)", shortname: "singlenode-15", multi: false, pg: 15}
         - {name: "Singlenode (14)", shortname: "singlenode-14", multi: false, pg: 14}
         - {name: "Singlenode (13)", shortname: "singlenode-13", multi: false, pg: 13}
         - {name: "Singlenode (12)", shortname: "singlenode-12", multi: false, pg: 12}

.github/workflows/integration.yml

@@ -19,6 +19,7 @@ jobs:
     strategy:
       matrix:
         pg:
+          - 15
           - 14
           - 13
           # TODO (mat): re-enable the pg12 test

CHANGELOG.md

@@ -16,6 +16,7 @@ We use the following categories for changes:
 ## Unreleased
 
 ### Added
+- Add support for PostgreSQL 15
 - Alerts from promscale monitoring mixin are groupped also by namespace label [#1714]
 - Added a new family of metrics tracking database maintenance jobs durations and failures [#1745]
 - Allow config options in file to be set as yaml mappings [#1737]

Makefile

@@ -28,14 +28,14 @@ pkg/tests/testdata/traces-dataset.sz:
 	wget https://github.com/timescale/promscale-test-data/raw/main/traces-dataset.sz -O ./pkg/tests/testdata/traces-dataset.sz
 
 .PHONY: e2e
-e2e: DOCKER_IMAGE?=$(shell ./scripts/fallback-docker.sh $(LOCAL_DOCKER_BASE):head-ts2-pg14 $(GHCR_DOCKER_BASE):$(CURRENT_BRANCH)-ts2-pg14 $(GHCR_DOCKER_BASE):$(EXTENSION_VERSION)-ts2-pg14)
+e2e: DOCKER_IMAGE?=$(shell ./scripts/fallback-docker.sh $(LOCAL_DOCKER_BASE):head-ts2-pg15 $(GHCR_DOCKER_BASE):$(CURRENT_BRANCH)-ts2-pg15 $(GHCR_DOCKER_BASE):$(EXTENSION_VERSION)-ts2-pg15)
 e2e: pkg/tests/testdata/traces-dataset.sz generate
 	go test -v ./pkg/tests/end_to_end_tests/ -timescale-docker-image=$(DOCKER_IMAGE)
 	# TODO: Skipping multinode because tests are broken for now
 	# go test -v ./pkg/tests/end_to_end_tests/ -use-multinode -timescale-docker-image=$(DOCKER_IMAGE)
 
 .PHONY: jaeger-storage-test
-jaeger-storage-test: DOCKER_IMAGE?=$(shell ./scripts/fallback-docker.sh $(LOCAL_DOCKER_BASE):head-ts2-pg14 $(GHCR_DOCKER_BASE):$(CURRENT_BRANCH)-ts2-pg14 $(GHCR_DOCKER_BASE):$(EXTENSION_VERSION)-ts2-pg14)
+jaeger-storage-test: DOCKER_IMAGE?=$(shell ./scripts/fallback-docker.sh $(LOCAL_DOCKER_BASE):head-ts2-pg15 $(GHCR_DOCKER_BASE):$(CURRENT_BRANCH)-ts2-pg15 $(GHCR_DOCKER_BASE):$(EXTENSION_VERSION)-ts2-pg15)
 jaeger-storage-test:
 	go test -v ./pkg/tests/end_to_end_tests/ -timescale-docker-image=$(DOCKER_IMAGE) -tags=jaeger_storage_test -run="^TestJaegerStorageIntegration/"
 

docker-compose/docker-compose.yaml

@@ -2,6 +2,7 @@ version: '3.0'
 
 services:
   db:
+    # TODO change to 15 when the new HA image is available
     image: timescale/timescaledb-ha:pg14-latest
     ports:
       - 5432:5432/tcp

docker-compose/high-availability/docker-compose.yaml

@@ -2,6 +2,7 @@ version: '3.0'
 
 services:
   db:
+    # TODO change to 15 when the new HA image is available
     image: timescale/timescaledb-ha:pg14-latest
     ports:
       - 5432:5432/tcp

docker-compose/jaeger-promscale-demo/docker-compose.yaml

@@ -2,6 +2,7 @@ version: '3.0'
 
 services:
   db:
+    # TODO change to 15 when the new HA image is available
     image: timescale/timescaledb-ha:pg14-latest
     environment:
       POSTGRES_PASSWORD: password

docker-compose/promscale-demo/docker-compose.yaml

@@ -2,6 +2,7 @@ version: '3.0'
 
 services:
   timescaledb:
+    # TODO change to 15 when the new HA image is available
     image: timescale/timescaledb-ha:pg14-latest
     restart: on-failure
     ports:
@@ -121,7 +122,7 @@ services:
       - 5052:5000/tcp
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317
-  
+
   digit:
     image: timescale/promscale-demo-digit
     restart: on-failure

pkg/version/version.go

@@ -44,7 +44,7 @@ var (
 	Branch                     = ""      // Comes from -ldflags settings
 	EarliestUpgradeTestVersion = "0.3.0" // 0.3.0 earliest version an image with correct extension versions exists
 
-	PgVersionNumRange       = ">=12.x <15.x" // Corresponds to range within pg 12.0 to pg 14.99
+	PgVersionNumRange       = ">=12.x <16.x" // Corresponds to range within pg 12.0 to pg 14.99
 	pgAcceptedVersionsRange = semver.MustParseRange(PgVersionNumRange)
 
 	TimescaleVersionRangeString = ">=2.6.1 <2.99.0"