Merge branch 'master' into add-citus-support

Author: staticle

README.rst

@@ -14,6 +14,9 @@ Spilo is currently evolving: Its creators are working on a Postgres operator tha
 How to Use This Docker Image
 ============================
 
+.. important::
+   We encourage users to build the Docker images themselves from source code using the latest tags to benefit from ongoing improvements and fixes. The team continues to maintain the project and address issues, but does not make regular releases nor publishes latest Docker images.
+
 Spilo's setup assumes that you've correctly configured a load balancer (HAProxy, ELB, Google load balancer) that directs client connections to the master. There are two ways to achieve this: A) if the load balancer relies on the status code to distinguish between the healthy and failed nodes (like ELB), then one needs to configure it to poll the API URL; otherwise, B) you can use callback scripts to change the load balancer configuration dynamically.
 
 **Available container registry and image architectures**

postgres-appliance/build_scripts/base.sh

@@ -121,16 +121,15 @@ for version in $DEB_PG_SUPPORTED_VERSIONS; do
         "postgresql-${version}-pg-stat-kcache" \
         "${EXTRAS[@]}"
 
-    # Clean up timescaledb versions except the highest compatible and transition version
+    # Clean up timescaledb versions except the last 5 minor versions
     exclude_patterns=()
-    prev_highest_ver="$ts_highest_ver"
-    ts_highest_ver=$(find "/usr/lib/postgresql/$version/lib/" -name 'timescaledb-2.*.so' | sed -rn 's/.*timescaledb-([1-9]+\.[0-9]+\.[0-9]+)\.so$/\1/p' | sort -rV | head -n1)
-    if [ "$prev_highest_ver" != "$ts_highest_ver" ]; then
-        ts_transition_version="$prev_highest_ver"
-    fi
-    for ts_version in "$ts_transition_version" "$ts_highest_ver"; do
-        exclude_patterns+=(! -name timescaledb-"${ts_version}".so)
-        exclude_patterns+=(! -name timescaledb-tsl-"${ts_version}".so)
+    versions=$(find "/usr/lib/postgresql/$version/lib/" -name 'timescaledb-2.*.so' | sed -rn 's/.*timescaledb-([1-9]+\.[0-9]+\.[0-9]+)\.so$/\1/p' | sort -rV)
+    latest_minor_versions=$(echo "$versions" | awk -F. '{print $1"."$2}' | uniq | head -n 5)
+    for minor in $latest_minor_versions; do
+        for full_version in $(echo "$versions" | grep "^$minor"); do
+            exclude_patterns+=(! -name timescaledb-"${full_version}".so)
+            exclude_patterns+=(! -name timescaledb-tsl-"${full_version}".so)
+        done
     done
     find "/usr/lib/postgresql/$version/lib/" \( -name 'timescaledb-2.*.so' -o -name 'timescaledb-tsl-2.*.so' \) "${exclude_patterns[@]}" -delete
 

postgres-appliance/scripts/callback_aws.py

@@ -3,10 +3,12 @@
 import boto.ec2
 import boto.utils
 import logging
+import os
 import sys
 import time
 
 logger = logging.getLogger(__name__)
+LEADER_TAG_VALUE = os.environ.get('AWS_LEADER_TAG_VALUE', 'master')
 
 
 def retry(func):
@@ -70,7 +72,7 @@ def main():
 
     instance = get_instance(ec2, instance_id)
 
-    tags = {'Role': role}
+    tags = {'Role': LEADER_TAG_VALUE if role == 'primary' else role}
     tag_resource(ec2, instance_id, tags)
 
     tags.update({'Instance': instance_id})

postgres-appliance/scripts/configure_spilo.py

@@ -577,6 +577,7 @@ def get_placeholders(provider):
     placeholders.setdefault('PAM_OAUTH2', '')
     placeholders.setdefault('CALLBACK_SCRIPT', '')
     placeholders.setdefault('DCS_ENABLE_KUBERNETES_API', '')
+    placeholders.setdefault('AWS_LEADER_TAG_VALUE', 'master')
     placeholders.setdefault('KUBERNETES_ROLE_LABEL', 'spilo-role')
     placeholders.setdefault('KUBERNETES_LEADER_LABEL_VALUE', 'master')
     placeholders.setdefault('KUBERNETES_STANDBY_LEADER_LABEL_VALUE', 'master')