Merge branch 'master' into trigger-sync

Author: hughcapet

.github/workflows/publish-ghcr-container.yaml

@@ -11,7 +11,7 @@ env:
 jobs:
   publish:
     name: Build and push Spilo multiarch images
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       contents: 'read'
       packages: 'write'
@@ -20,15 +20,15 @@ jobs:
         shell: bash
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Set up packages
+      run: sudo apt-get install -y docker-compose
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.7
-
-    - name: Install flake8 and docker-compose
-      run: python -m pip install flake8 docker-compose==1.17.1
+        python-version: '3.10'
 
     - name: Derive spilo image name
       id: image
@@ -39,20 +39,20 @@ jobs:
         echo "NAME=$IMAGE" >> $GITHUB_OUTPUT
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
 
     - name: Login to GHCR
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and export to local docker for testing
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v6
       with:
         context: "postgres-appliance/"
         load: true
@@ -65,7 +65,7 @@ jobs:
         bash postgres-appliance/tests/test_spilo.sh 
 
     - name: Build arm64 additionaly and push multiarch image to ghcr
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v6
       with:
         context: "postgres-appliance/"
         push: true

ENVIRONMENT.rst

@@ -101,7 +101,9 @@ Environment Configuration Settings
 - **LOG_GROUP_BY_DATE**: (optional) enable grouping log by date. Default is False - group the log files based on the instance ID.
 - **DCS_ENABLE_KUBERNETES_API**: a non-empty value forces Patroni to use Kubernetes as a DCS. Default is empty.
 - **KUBERNETES_USE_CONFIGMAPS**: a non-empty value makes Patroni store its metadata in ConfigMaps instead of Endpoints when running on Kubernetes. Default is empty.
-- **KUBERNETES_ROLE_LABEL**: name of the label containing Postgres role when running on Kubernetens. Default is 'spilo-role'.
+- **KUBERNETES_ROLE_LABEL**: name of the label containing Postgres role when running on Kubernetes. Default is 'spilo-role'.
+- **KUBERNETES_LEADER_LABEL_VALUE**: value of the pod label if Postgres role is primary when running on Kubernetes. Default is 'master'.
+- **KUBERNETES_STANDBY_LEADER_LABEL_VALUE**: value of the pod label if Postgres role is standby_leader when running on Kubernetes. Default is 'master'.
 - **KUBERNETES_SCOPE_LABEL**: name of the label containing cluster name. Default is 'version'.
 - **KUBERNETES_LABELS**: a JSON describing names and values of other labels used by Patroni on Kubernetes to locate its metadata. Default is '{"application": "spilo"}'.
 - **INITDB_LOCALE**: database cluster's default UTF-8 locale (en_US by default)

kubernetes/spilo_kubernetes.yaml

@@ -79,6 +79,10 @@ spec:
           value: spilo-cluster
         - name: KUBERNETES_ROLE_LABEL
           value: role
+        - name: KUBERNETES_LEADER_LABEL_VALUE
+          value: master
+        - name: KUBERNETES_STANDBY_LEADER_LABEL_VALUE
+          value: master
         - name: SPILO_CONFIGURATION
           value: | ## https://github.com/zalando/patroni#yaml-configuration
             bootstrap:

postgres-appliance/Dockerfile

@@ -74,7 +74,7 @@ COPY --from=dependencies-builder /builddeps/wal-g /usr/local/bin/
 COPY build_scripts/patroni_wale.sh build_scripts/compress_build.sh /builddeps/
 
 # Install patroni and wal-e
-ENV PATRONIVERSION=3.3.5
+ENV PATRONIVERSION=4.0.4
 ENV WALE_VERSION=1.1.1
 
 WORKDIR /

postgres-appliance/runit/pgqd/run

@@ -6,4 +6,4 @@ if ! $CHPST true 2> /dev/null; then
 fi
 
 exec 2>&1
-exec $CHPST env -i PGAPPNAME="pgq ticker" /scripts/patroni_wait.sh --role master -- /usr/bin/pgqd /home/postgres/pgq_ticker.ini
+exec $CHPST env -i PGAPPNAME="pgq ticker" /scripts/patroni_wait.sh --role primary -- /usr/bin/pgqd /home/postgres/pgq_ticker.ini

postgres-appliance/scripts/callback_aws.py

@@ -65,7 +65,7 @@ def main():
 
     ec2 = boto.ec2.connect_to_region(metadata['region'])
 
-    if argc == 5 and role in ('master', 'standby_leader') and action in ('on_start', 'on_role_change'):
+    if argc == 5 and role in ('primary', 'standby_leader') and action in ('on_start', 'on_role_change'):
         associate_address(ec2, sys.argv[1], instance_id)
 
     instance = get_instance(ec2, instance_id)

postgres-appliance/scripts/callback_role.py

@@ -19,6 +19,7 @@
 logger = logging.getLogger(__name__)
 
 LABEL = os.environ.get("KUBERNETES_ROLE_LABEL", 'spilo-role')
+LEADER_LABEL_VALUE = os.environ.get("KUBERNETES_LEADER_LABEL_VALUE", 'master')
 
 
 def read_first_line(filename):
@@ -78,7 +79,7 @@ def record_role_change(action, new_role, cluster):
     new_role = None if action == 'on_stop' else new_role
     logger.debug("Changing the pod's role to %s", new_role)
     pod_namespace = os.environ.get('POD_NAMESPACE', read_first_line(KUBE_NAMESPACE_FILENAME)) or 'default'
-    if new_role == 'master':
+    if new_role == LEADER_LABEL_VALUE:
         change_endpoints(pod_namespace, cluster)
     change_pod_role_label(pod_namespace, new_role)
 

postgres-appliance/scripts/configure_spilo.py

@@ -379,7 +379,7 @@ def deep_update(a, b):
     threshold_megabytes: {{WALE_BACKUP_THRESHOLD_MEGABYTES}}
     threshold_backup_size_percentage: {{WALE_BACKUP_THRESHOLD_PERCENTAGE}}
     retries: 2
-    no_master: 1
+    no_leader: 1
   {{/USE_WALE}}
   basebackup_fast_xlog:
     command: /scripts/basebackup.sh
@@ -390,7 +390,7 @@ def deep_update(a, b):
     threshold_megabytes: {{WALE_BACKUP_THRESHOLD_MEGABYTES}}
     threshold_backup_size_percentage: {{WALE_BACKUP_THRESHOLD_PERCENTAGE}}
     retries: 2
-    no_master: 1
+    no_leader: 1
 {{/STANDBY_WITH_WALE}}
 '''
 
@@ -578,6 +578,8 @@ def get_placeholders(provider):
     placeholders.setdefault('CALLBACK_SCRIPT', '')
     placeholders.setdefault('DCS_ENABLE_KUBERNETES_API', '')
     placeholders.setdefault('KUBERNETES_ROLE_LABEL', 'spilo-role')
+    placeholders.setdefault('KUBERNETES_LEADER_LABEL_VALUE', 'master')
+    placeholders.setdefault('KUBERNETES_STANDBY_LEADER_LABEL_VALUE', 'master')
     placeholders.setdefault('KUBERNETES_SCOPE_LABEL', 'version')
     placeholders.setdefault('KUBERNETES_LABELS', KUBERNETES_DEFAULT_LABELS)
     placeholders.setdefault('KUBERNETES_USE_CONFIGMAPS', '')

postgres-appliance/scripts/on_role_change.sh

@@ -7,7 +7,7 @@ shift
 
 
 readonly dbname=postgres
-if [[ "${*: -3:1}" == "on_role_change" && "${*: -2:1}" == "master" ]]; then
+if [[ "${*: -3:1}" == "on_role_change" && "${*: -2:1}" == "primary" ]]; then
     num=30  # wait 30 seconds for end of recovery
     while  [[ $((num--)) -gt 0 ]]; do
         if [[ "$(psql -d $dbname -tAc 'SELECT pg_catalog.pg_is_in_recovery()')" == "f" ]]; then

postgres-appliance/scripts/patroni_wait.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ROLE=master
+ROLE=primary
 INTERVAL=60
 TIMEOUT=""
 
@@ -17,7 +17,7 @@ Options:
 
     -t, --timeout   Fail after TIMEOUT seconds (default: no timeout)
 
-Waits for ROLE (master or replica). It will check every INTERVAL seconds ($INTERVAL).
+Waits for ROLE (primary or replica). It will check every INTERVAL seconds ($INTERVAL).
 If TIMEOUT is specified, it will stop trying after TIMEOUT seconds.
 
 Executes COMMAND after ROLE has become available. (Default: exit 0)

postgres-appliance/scripts/wale_restore.sh

@@ -24,7 +24,7 @@ while getopts ":-:" optchar; do
         threshold_megabytes=*|threshold-megabytes=* )
             THRESHOLD_MEGABYTES=${OPTARG#*=}
             ;;
-        no_master=*|no-master=* )
+        no_leader=*|no-master=* )
             NO_MASTER=${OPTARG#*=}
             ;;
     esac