Merging

thomasboussekey · thomasboussekey · commit c0a2cadb35ff · 2026-04-02T16:27:12.000+02:00
diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml
@@ -41,7 +41,6 @@ jobs:
             _shared: &shared
               - 'docker-bake.hcl'
               - 'Taskfile.yml'
-              - 'kind-config.yaml'
               - 'test/**'
               - '.github/workflows/bake*.yml'
             pgvector:
diff --git a/.github/workflows/bake_targets.yml b/.github/workflows/bake_targets.yml
@@ -16,7 +16,7 @@ permissions: {}
 jobs:
   testbuild:
     name: Build ${{ inputs.extension_name }}
-    runs-on: ubuntu-24.04
+    runs-on: ${{ github.repository_owner == 'cloudnative-pg' && 'ubuntu-latest-16-cores' || 'ubuntu-24.04' }}
     permissions:
       contents: read
       packages: write
@@ -119,7 +119,7 @@ jobs:
       fail-fast: false
       matrix:
         image: ${{fromJson(needs.testbuild.outputs.images)}}
-        cnpg: ["main", "1.27", "1.28"]
+        cnpg: ["main", "1.28", "1.29"]
     steps:
       - name: Checkout Code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -137,8 +137,10 @@ jobs:
           curl -L https://dl.dagger.io/dagger/install.sh | BIN_DIR=$HOME/.local/bin sh
 
       - name: Set up environment
+        env:
+          CNPG_RELEASE: ${{ matrix.cnpg }}
         run: |
-          task e2e:setup-env
+          task e2e:setup-env CNPG_RELEASE=$CNPG_RELEASE
 
       - name: Generate Chainsaw testing values
         env:
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -21,6 +21,8 @@ vars:
   KIND_NODE_VERSION: v1.35.1@sha256:05d7bcdefbda08b4e038f644c4df690cdac3fba8b06f8289f30e10026720a1ab
   K8S_VERSION: '{{ regexReplaceAll "^v([0-9.]+).*" .KIND_NODE_VERSION "$1" }}'
   KIND_CLUSTER_NAME: pg-extensions-{{ .K8S_VERSION }}
+  # renovate: datasource=github-tags depName=cloudnative-pg/cloudnative-pg versioning=semver extractVersion=^v(?<version>\d+\.\d+)\.\d+$
+  CNPG_RELEASE_DEFAULT: 1.29
 
 tasks:
   default:
@@ -229,10 +231,21 @@ tasks:
     env:
       _EXPERIMENTAL_DAGGER_RUNNER_HOST: container://{{ .DAGGER_ENGINE_NAME }}
     cmds:
-      - >
-        dagger call -m github.com/aweris/daggerverse/kind@{{ .DAGGER_KIND_SHA }} --socket {{ .DOCKER_SOCKET }}
-        container with-env-variable --name=KIND_EXPERIMENTAL_DOCKER_NETWORK --value={{ .E2E_NETWORK }} with-env-variable --name=CACHE_BUSTER --value="$(date)"
-        with-file --source=kind-config.yaml --path=/root/kind-config.yaml
+      - |
+        KIND_CONFIG=$(cat <<'EOF'
+        kind: Cluster
+        apiVersion: kind.x-k8s.io/v1alpha4
+        featureGates:
+          ImageVolume: true
+        containerdConfigPatches:
+          - |-
+            [plugins."io.containerd.cri.v1.images".registry]
+              config_path = "/etc/containerd/certs.d"
+        EOF
+        )
+        dagger call -m github.com/aweris/daggerverse/kind@{{ .DAGGER_KIND_SHA }} --socket {{ .DOCKER_SOCKET }} \
+        container with-env-variable --name=KIND_EXPERIMENTAL_DOCKER_NETWORK --value={{ .E2E_NETWORK }} with-env-variable --name=CACHE_BUSTER --value="$(date)" \
+        with-new-file --contents="${KIND_CONFIG}" --path=/root/kind-config.yaml \
         with-exec --args="kind","create","cluster","--name","{{ .KIND_CLUSTER_NAME }}","--image","kindest/node:{{ .KIND_NODE_VERSION }}","--config","/root/kind-config.yaml" sync
       - docker exec "{{ .KIND_CLUSTER_NAME }}-control-plane" mkdir -p "{{ .REGISTRY_DIR }}"
       - |
@@ -267,8 +280,7 @@ tasks:
           REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME }}'
     internal: true
     vars:
-      # renovate: datasource=github-tags depName=cloudnative-pg/cloudnative-pg versioning=semver extractVersion=^v(?<version>\d+\.\d+)\.\d+$
-      CNPG_RELEASE: 1.28
+      CNPG_RELEASE: '{{ .CNPG_RELEASE | default .CNPG_RELEASE_DEFAULT }}'
       # renovate: datasource=docker depName=alpine/kubectl versioning=docker
       KUBECTL_VERSION: 1.35.3@sha256:ebf9d81d06441b3183fdc6e2dbc9f5d0db4d0464808b5bcd3c9021f54f6e65db
       DOCKER_SOCKET:
@@ -336,13 +348,15 @@ tasks:
     vars:
       REGISTRY_HOST: '{{ .REGISTRY_HOST | default "" }}'
       REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME | default "" }}'
+      CNPG_RELEASE: '{{ .CNPG_RELEASE | default .CNPG_RELEASE_DEFAULT }}'
     deps:
       - e2e:start-container-registry
       - e2e:start-dagger-engine
       - task: e2e:install-cnpg
         vars:
           REGISTRY_HOST: '{{ .REGISTRY_HOST }}'
           REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME }}'
+          CNPG_RELEASE: '{{ .CNPG_RELEASE }}'
     cmds:
       - echo -e "{{.GREEN}}--- E2E environment setup complete ---{{.NC}}"
 
@@ -410,11 +424,13 @@ tasks:
       DISTRO: '{{ .DISTRO | default "trixie" }}'
       REGISTRY_HOST: '{{ .REGISTRY_HOST | default "" }}'
       REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME | default "" }}'
+      CNPG_RELEASE: '{{ .CNPG_RELEASE | default .CNPG_RELEASE_DEFAULT }}'
     cmds:
       - task: e2e:setup-env
         vars:
           REGISTRY_HOST: '{{ .REGISTRY_HOST }}'
           REGISTRY_USERNAME: '{{ .REGISTRY_USERNAME }}'
+          CNPG_RELEASE: '{{ .CNPG_RELEASE }}'
       - task: bake
         vars:
           PUSH: "true"
diff --git a/dagger/maintenance/catalogs.go b/dagger/maintenance/catalogs.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"slices"
+	"sort"
 
 	"go.yaml.in/yaml/v3"
 
@@ -22,13 +23,19 @@ type ImageVolumeSource struct {
 	PullPolicy string `yaml:"pullPolicy,omitempty"`
 }
 
+type ExtensionEnvVar struct {
+	Name  string `yaml:"name"`
+	Value string `yaml:"value"`
+}
+
 type ExtensionConfiguration struct {
 	Name                 string            `yaml:"name"`
 	ImageVolumeSource    ImageVolumeSource `yaml:"image"`
 	ExtensionControlPath []string          `yaml:"extension_control_path,omitempty"`
 	DynamicLibraryPath   []string          `yaml:"dynamic_library_path,omitempty"`
 	LdLibraryPath        []string          `yaml:"ld_library_path,omitempty"`
 	BinPath              []string          `yaml:"bin_path,omitempty"`
+	Env                  []ExtensionEnvVar `yaml:"env,omitempty"`
 }
 
 type ImageCatalog struct {
@@ -111,3 +118,14 @@ func writeCatalogToDir(catalog *ImageCatalog, outDir *dagger.Directory) (*dagger
 
 	return outDir.WithNewFile(outName, buf.String()), nil
 }
+
+func envMapToSlice(env map[string]string) []ExtensionEnvVar {
+	result := make([]ExtensionEnvVar, 0, len(env))
+	for name, value := range env {
+		result = append(result, ExtensionEnvVar{Name: name, Value: value})
+	}
+	sort.Slice(result, func(i, j int) bool {
+		return result[i].Name < result[j].Name
+	})
+	return result
+}
diff --git a/dagger/maintenance/main.go b/dagger/maintenance/main.go
@@ -204,6 +204,7 @@ func (m *Maintenance) GenerateTestingValues(
 		Name:                   metadata.Name,
 		SQLName:                metadata.SQLName,
 		SharedPreloadLibraries: metadata.SharedPreloadLibraries,
+		PostgresqlParameters:   metadata.PostgresqlParameters,
 		PgImage:                pgImage,
 		Version:                version,
 		CreateExtension:        metadata.CreateExtension,
@@ -515,6 +516,7 @@ func (m *Maintenance) GenerateCatalogs(
 					DynamicLibraryPath:   metadata.DynamicLibraryPath,
 					LdLibraryPath:        metadata.LdLibraryPath,
 					BinPath:              metadata.BinPath,
+					Env:                  envMapToSlice(metadata.Env),
 				}
 
 				img.Extensions = append(img.Extensions, extensionsConfig)
diff --git a/dagger/maintenance/parse.go b/dagger/maintenance/parse.go
@@ -25,19 +25,21 @@ type extensionVersion struct {
 type versionMap map[string]map[string]extensionVersion
 
 type extensionMetadata struct {
-	Name                   string     `hcl:"name" cty:"name"`
-	SQLName                string     `hcl:"sql_name" cty:"sql_name"`
-	ImageName              string     `hcl:"image_name" cty:"image_name"`
-	SharedPreloadLibraries []string   `hcl:"shared_preload_libraries" cty:"shared_preload_libraries"`
-	ExtensionControlPath   []string   `hcl:"extension_control_path" cty:"extension_control_path"`
-	DynamicLibraryPath     []string   `hcl:"dynamic_library_path" cty:"dynamic_library_path"`
-	LdLibraryPath          []string   `hcl:"ld_library_path" cty:"ld_library_path"`
-	BinPath                []string   `hcl:"bin_path" cty:"bin_path"`
-	AutoUpdateOsLibs       bool       `hcl:"auto_update_os_libs" cty:"auto_update_os_libs"`
-	RequiredExtensions     []string   `hcl:"required_extensions" cty:"required_extensions"`
-	CreateExtension        bool       `hcl:"create_extension" cty:"create_extension"`
-	Versions               versionMap `hcl:"versions" cty:"versions"`
-	Remain                 hcl.Body   `hcl:",remain"`
+	Name                   string            `hcl:"name" cty:"name"`
+	SQLName                string            `hcl:"sql_name" cty:"sql_name"`
+	ImageName              string            `hcl:"image_name" cty:"image_name"`
+	SharedPreloadLibraries []string          `hcl:"shared_preload_libraries" cty:"shared_preload_libraries"`
+	PostgresqlParameters   map[string]string `hcl:"postgresql_parameters" cty:"postgresql_parameters"`
+	ExtensionControlPath   []string          `hcl:"extension_control_path" cty:"extension_control_path"`
+	DynamicLibraryPath     []string          `hcl:"dynamic_library_path" cty:"dynamic_library_path"`
+	LdLibraryPath          []string          `hcl:"ld_library_path" cty:"ld_library_path"`
+	BinPath                []string          `hcl:"bin_path" cty:"bin_path"`
+	Env                    map[string]string `hcl:"env" cty:"env"`
+	AutoUpdateOsLibs       bool              `hcl:"auto_update_os_libs" cty:"auto_update_os_libs"`
+	RequiredExtensions     []string          `hcl:"required_extensions" cty:"required_extensions"`
+	CreateExtension        bool              `hcl:"create_extension" cty:"create_extension"`
+	Versions               versionMap        `hcl:"versions" cty:"versions"`
+	Remain                 hcl.Body          `hcl:",remain"`
 }
 
 const (
diff --git a/dagger/maintenance/testingvalues.go b/dagger/maintenance/testingvalues.go
@@ -21,6 +21,7 @@ type TestingValues struct {
 	Name                   string                    `yaml:"name"`
 	SQLName                string                    `yaml:"sql_name"`
 	SharedPreloadLibraries []string                  `yaml:"shared_preload_libraries"`
+	PostgresqlParameters   map[string]string         `yaml:"postgresql_parameters"`
 	PgImage                string                    `yaml:"pg_image"`
 	Version                string                    `yaml:"version"`
 	CreateExtension        bool                      `yaml:"create_extension"`
@@ -109,6 +110,7 @@ func generateExtensionConfiguration(metadata *extensionMetadata, extensionImage
 		DynamicLibraryPath:   metadata.DynamicLibraryPath,
 		LdLibraryPath:        metadata.LdLibraryPath,
 		BinPath:              metadata.BinPath,
+		Env:                  envMapToSlice(metadata.Env),
 	}, nil
 }
 
diff --git a/kind-config.yaml b/kind-config.yaml
diff --git a/pg-crash/metadata.hcl b/pg-crash/metadata.hcl
@@ -6,10 +6,12 @@ metadata = {
   image_name               = "pg-crash"
   licenses                 = ["BSD-3-Clause"]
   shared_preload_libraries = ["pg_crash"]
+  postgresql_parameters    = {}
   extension_control_path   = []
   dynamic_library_path     = []
   ld_library_path          = []
   bin_path                 = []
+  env                      = {}
   auto_update_os_libs      = false
   required_extensions      = []
   create_extension         = false
diff --git a/pgaudit/metadata.hcl b/pgaudit/metadata.hcl
@@ -4,10 +4,12 @@ metadata = {
   image_name               = "pgaudit"
   licenses                 = ["PostgreSQL"]
   shared_preload_libraries = ["pgaudit"]
+  postgresql_parameters    = {}
   extension_control_path   = []
   dynamic_library_path     = []
   ld_library_path          = []
   bin_path                 = []
+  env                      = {}
   auto_update_os_libs      = false
   required_extensions      = []
   create_extension         = true
diff --git a/pgvector/metadata.hcl b/pgvector/metadata.hcl
@@ -4,10 +4,12 @@ metadata = {
   image_name               = "pgvector"
   licenses                 = ["PostgreSQL"]
   shared_preload_libraries = []
+  postgresql_parameters    = {}
   extension_control_path   = []
   dynamic_library_path     = []
   ld_library_path          = []
   bin_path                 = []
+  env                      = {}
   auto_update_os_libs      = false
   required_extensions      = []
   create_extension         = true
diff --git a/postgis/Dockerfile b/postgis/Dockerfile
@@ -61,7 +61,7 @@ COPY --from=builder \
 	/usr/lib/postgresql/${PG_MAJOR}/lib/postgis* \
 	/lib/
 
-COPY --from=builder /usr/lib/postgresql/18/lib/bitcode/ /lib/bitcode/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/ /lib/bitcode/
 
 # Share
 COPY --from=builder \
@@ -70,6 +70,8 @@ COPY --from=builder \
 	/share/extension/
 
 COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/contrib/postgis* /share/contrib/
+COPY --from=builder /usr/share/gdal/ /share/gdal/
+COPY --from=builder /usr/share/proj/ /share/proj/
 
 # System libs
 COPY --from=builder /system /system/
diff --git a/postgis/README.md b/postgis/README.md
@@ -32,6 +32,12 @@ spec:
         reference: ghcr.io/cloudnative-pg/postgis-extension:3.6.2-18-trixie
       ld_library_path:
       - system
+      # Requires CloudNativePG 1.29 (or higher)
+      env:
+      - name: GDAL_DATA
+        value: ${image_root}/share/gdal
+      - name: PROJ_DATA
+        value: ${image_root}/share/proj
 ```
 
 ### 2. Enable the extension in a database
diff --git a/postgis/metadata.hcl b/postgis/metadata.hcl
@@ -5,10 +5,15 @@ metadata = {
   licenses                 = [ "GPL-2.0-or-later", "MIT", "LGPL-2.1-or-later",
                                "GPL-3.0-or-later", "Apache-2.0", "PostgreSQL", "Zlib" ]
   shared_preload_libraries = []
+  postgresql_parameters    = {}
   extension_control_path   = []
   dynamic_library_path     = []
   ld_library_path          = ["system"]
   bin_path                 = []
+  env                      = {
+    "GDAL_DATA" = "$${image_root}/share/gdal",
+    "PROJ_DATA" = "$${image_root}/share/proj",
+  }
   auto_update_os_libs      = true
   required_extensions      = []
   create_extension         = true
diff --git a/postgis/test/cluster.yaml b/postgis/test/cluster.yaml
@@ -10,5 +10,6 @@ spec:
     size: 1Gi
 
   postgresql:
+    parameters: ($values.postgresql_parameters)
     shared_preload_libraries: ($values.shared_preload_libraries)
     extensions: ($values.extensions)
diff --git a/templates/README.md.tmpl b/templates/README.md.tmpl
@@ -62,7 +62,7 @@ spec:
     name: cluster-{{ .Name }}
   extensions:
   - name: {{ .Name }}
-    # renovate: suite={{ .DefaultDistro }}-pgdg depName={{ replaceAll .Package "%version%" (printf "%d" .DefaultVersion) }} extractVersion=^(?<version>\d+\.\d+\.\d+)
+    # renovate: suite={{ .DefaultDistro }}-pgdg depName={{ replaceAll .Package "%version%" (printf "%d" .DefaultVersion) }} extractVersion=^(?<version>\d+\.\d+)
     version: '1.0'
 ```
 
diff --git a/templates/metadata.hcl.tmpl b/templates/metadata.hcl.tmpl
@@ -27,6 +27,17 @@ metadata = {
   # Example: ["pgaudit"].
   shared_preload_libraries = []
 
+  # TODO: Remove this comment block after customizing the file.
+  # `postgresql_parameters`: custom PostgreSQL configuration parameters to be set
+  # for this extension. This is a map of key-value pairs.
+  # This option should be reserved for parameters that are strictly necessary
+  # for the extension to function properly. Avoid setting parameters that just
+  # customize the behavior of the extension.
+  # Usually empty.
+  # Used in tests.
+  # Example: { "pgaudit.log_client" = "on" }.
+  postgresql_parameters    = {}
+
   # TODO: Remove this comment block after customizing the file.
   # `extension_control_path`: if EMPTY (`[]`), the operator follows the CNPG
   # convention and will add the image's `share` directory to
@@ -58,6 +69,29 @@ metadata = {
   # Postgres process. Used in tests and to generate image catalogs.
   bin_path                 = []
 
+  # TODO: Remove this comment block after customizing the file.
+  # `env`: Optional map of environment variables to be injected into the
+  # PostgreSQL process for this extension.
+  #
+  # NOTE: Both HCL and the CNPG operator use `${...}` for placeholder
+  # expansion. In both systems, `$${...}` is the escape that produces a
+  # literal `${...}` in the output (`$$` without a following `{` is kept
+  # as-is).
+  #
+  # 1. CNPG Placeholders: Use `$${...}` to pass a placeholder through HCL
+  #    to the operator, which then expands it.
+  #    Example: { "LIB_PATH" = "$${image_root}/lib" }
+  #    HCL output: ${image_root}/lib -> Operator expands to the mount path
+  #
+  # 2. Literal `${...}`: Use `$$${...}` so that HCL produces `$${...}`,
+  #    which the operator then treats as a literal `${...}`.
+  #    Example: { "TOKEN_FORMAT" = "$$${value}" }
+  #    HCL output: $${value} -> Operator produces literal: ${value}
+  #
+  # 3. Static Values: No special escaping needed.
+  #    Example: { "DEBUG" = "true" }
+  env = {}
+
   # TODO: Remove this comment block after customizing the file.
   # `auto_update_os_libs`: set to true to allow the maintenance tooling
   # to update OS libraries automatically; look at the `postgis` example.
diff --git a/test/cluster.yaml b/test/cluster.yaml
@@ -10,5 +10,6 @@ spec:
     size: 1Gi
 
   postgresql:
+    parameters: ($values.postgresql_parameters)
     shared_preload_libraries: ($values.shared_preload_libraries)
     extensions: ($values.extensions)
