version: 1.16.0-SNAPSHOT

Author: teoincontatto

stackgres-k8s/ci/build/ciw

@@ -1,6 +1,7 @@
 #!/bin/sh
 PROJECT_PATH="$(realpath "$(dirname "$0")/../../..")"
 CONTAINER_NAME="${CONTAINER_NAME:-buildw-$(printf '%x' "$(date +%s)")}"
+export PATH=/bin:/usr/bin:/usr/local/bin
 env > "/tmp/$CONTAINER_NAME.env"
 IMAGE="${IMAGE:-registry.gitlab.com/ongresinc/stackgres/$(yq -r '.variables.SG_CI_IMAGE_NAME' "$PROJECT_PATH"/.gitlab-ci.yml 2>/dev/null || sed -n 's/ *SG_CI_IMAGE_NAME: "\([^"]\+\)" */\1/p' .gitlab-ci.yml)-$(uname -m | grep -qxF aarch64 && echo arm64 || echo amd64)}"
 # shellcheck disable=SC2046

stackgres-k8s/e2e/spec/dbops-security-upgrade

@@ -59,13 +59,19 @@ e2e_test_install() {
   PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION="${PREVIOUS_OLDEST_PATRONI_IMAGE##*-pg}"
   PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION="${PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%-build-*}"
   PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_MAJOR_VERSION="${PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%.*}"
+  PREVIOUS_SHARDED_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg16\.' | head -n 1)"
+  PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION="${PREVIOUS_SHARDED_PATRONI_IMAGE##*-pg}"
+  PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION="${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%-build-*}"
+  PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_MAJOR_VERSION="${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%.*}"
   PREVIOUS_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | tail -n 1)"
   PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION="${PREVIOUS_PATRONI_IMAGE##*-pg}"
   PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION="${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%-build-*}"
   PREVIOUS_PATRONI_IMAGE_POSTGRES_MAJOR_VERSION="${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION_WITH_BUILD_VERSION%%.*}"
   PATRONI_IMAGE="$(get_component_images "$STACKGRES_VERSION")"
   OLDEST_PATRONI_IMAGE="$(printf %s "$PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg'"$PREVIOUS_OLDEST_PATRONI_IMAGE_POSTGRES_VERSION-")"
   OLDEST_PATRONI_IMAGE="$(printf '%s' "$OLDEST_PATRONI_IMAGE" | tail -n 1)"
+  SHARDED_PATRONI_IMAGE="$(printf %s "$PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg'"$PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION-")"
+  SHARDED_PATRONI_IMAGE="$(printf '%s' "$SHARDED_PATRONI_IMAGE" | tail -n 1)"
   if [ "$PREVIOUS_VERSION_AS_NUMBER" -ge "$VERSION_AS_NUMBER_1_15_0" ]
   then
     DISTRIBUTEDLOGS_PATRONI_IMAGE="$(printf '%s' "$PATRONI_IMAGE" | tail -n 1)"
@@ -154,11 +160,13 @@ e2e_test_install() {
 
     create_or_replace_sharded_cluster_for_version "$STACKGRES_PREVIOUS_VERSION" \
       "$CLUSTER_3_NAME" "$CLUSTER_NAMESPACE" 3 1 \
-      --set configurations.create=false --set instanceProfiles=false \
+      --set configurations.create=true --set instanceProfiles=false \
+      --set configurations.postgresconfig.create=true \
+      --set configurations.poolingconfig.create=false \
       --set-string cluster.sgInstanceProfile=size-s \
-      --set-string cluster.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
-      --set-string shardedCluster.shards.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
-      --set-string cluster.postgres.version="$PREVIOUS_PATRONI_IMAGE_POSTGRES_VERSION" \
+      --set-string cluster.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
+      --set-string shardedCluster.shards.configurations.sgPostgresConfig=postgresconf-"${PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION%.*}" \
+      --set-string cluster.postgres.version="$PREVIOUS_SHARDED_PATRONI_IMAGE_POSTGRES_VERSION" \
       --set cluster.configurations.observability.prometheusAutobind=true \
       --set configurations.objectstorage.create=false \
       --set-string cluster.configurations.backups.sgObjectStorage=backupconf \
@@ -584,6 +592,8 @@ check_cluster_2_security_upgrade_start() {
 }
 
 check_cluster_3_security_upgrade_start() {
+  local PREVIOUS_PATRONI_IMAGE="$PREVIOUS_SHARDED_PATRONI_IMAGE"
+
   check_sharded_cluster_security_upgrade_start \
     "$CLUSTER_3_NAME" "$DBOPS_3_NAME" "InPlace" \
     "$PREVIOUS_PATRONI_3_CONFIG_PATH" "$PREVIOUS_PGBOUNCER_3_CONFIG_PATH"
@@ -609,6 +619,8 @@ check_cluster_2_security_upgrade() {
 }
 
 check_cluster_3_security_upgrade() {
+  local PATRONI_IMAGE="$SHARDED_PATRONI_IMAGE"
+
   check_sharded_cluster_security_upgrade \
     "$CLUSTER_3_NAME" "$DBOPS_3_NAME" "InPlace"
 }

stackgres-k8s/e2e/spec/operator-helm

@@ -24,10 +24,10 @@ e2e_test() {
   run_test "Check that operator can not be upgrade from an alpha version" check_operator_upgrade_alpha
   run_test "Check that operator can not be upgrade from a beta version" check_operator_upgrade_beta
   run_test "Check that operator can not be upgrade from version 0.9.5" check_operator_upgrade_0_9_5
-  run_test "Check that operator can be upgrade from version 1.13.0" check_operator_upgrade_1_13_0
   run_test "Check that operator can be upgrade from version 1.14.0" check_operator_upgrade_1_14_0
+  run_test "Check that operator can be upgrade from version 1.15.0" check_operator_upgrade_1_15_0
   run_test "Check that operator can not be upgrade with an SGCluster that uses version 0.9.5" check_operator_upgrade_with_cluster_using_0_9_5
-  run_test "Check that operator can be upgrade with an SGCluster that uses version 1.13.0 and 1.14.0" check_operator_upgrade_with_cluster_using_1_13_0_and_1_14_0
+  run_test "Check that operator can be upgrade with an SGCluster that uses version 1.14.0 and 1.15.0" check_operator_upgrade_with_cluster_using_1_14_0_and_1_15_0
   run_test "Check that operator can be deleted" check_operator_delete
   run_test "Check that operator can be installed from outside" check_operator_install_outside
   run_test "Check that operator can be installed with load balancer" check_operator_install_load_balancer
@@ -163,17 +163,17 @@ check_operator_upgrade_0_9_5() {
   fi
 }
 
-check_operator_upgrade_1_13_0() {
-  local PREVIOUS_VERSION=1.13.0
+check_operator_upgrade_1_15_0() {
+  local PREVIOUS_VERSION=1.15.0
   kubectl label deployment -n "$OPERATOR_NAMESPACE" stackgres-operator \
     --overwrite "version=$PREVIOUS_VERSION"
   local EXIT_CODE RESULT
   try_function upgrade_operator
   if "$RESULT"
   then
-    success "Upgrade did not failed when previous version was 1.13.0"
+    success "Upgrade did not failed when previous version was 1.15.0"
   else
-    fail "Upgrade failed when previous version was 1.13.0"
+    fail "Upgrade failed when previous version was 1.15.0"
   fi
 }
 
@@ -214,13 +214,13 @@ check_operator_upgrade_with_cluster_using_0_9_5() {
   remove_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE"
 }
 
-check_operator_upgrade_with_cluster_using_1_13_0_and_1_14_0() {
+check_operator_upgrade_with_cluster_using_1_14_0_and_1_15_0() {
   CLUSTER_1_NAME="$(get_sgcluster_name "$SPEC_NAME-1")"
   CLUSTER_2_NAME="$(get_sgcluster_name "$SPEC_NAME-2")"
   NODE_LABEL_KEY="$(random_string)"
   NODE_LABEL_VALUE="$(random_string)"
-  local PREVIOUS_VERSION_1=1.13.0
-  local PREVIOUS_VERSION_2=1.14.0
+  local PREVIOUS_VERSION_1=1.14.0
+  local PREVIOUS_VERSION_2=1.15.0
   create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 1 \
     --set cluster.create=false \
     --set-string cluster.postgres.version=13.9
@@ -246,9 +246,9 @@ check_operator_upgrade_with_cluster_using_1_13_0_and_1_14_0() {
   try_function upgrade_operator
   if "$RESULT"
   then
-    success "Upgrade did not failed with an SGCluster that uses version 1.13.0 and 1.14.0"
+    success "Upgrade did not failed with an SGCluster that uses version 1.14.0 and 1.15.0"
   else
-    fail "Upgrade failed with an SGCluster that uses version 1.13.0 and 1.14.0"
+    fail "Upgrade failed with an SGCluster that uses version 1.14.0 and 1.15.0"
   fi
   remove_cluster "$CLUSTER_1_NAME" "$CLUSTER_NAMESPACE"
   remove_cluster "$CLUSTER_2_NAME" "$CLUSTER_NAMESPACE"

stackgres-k8s/e2e/spec/previous/1.13/spec/stream-to-cloudevent.files/Dockerfile

@@ -229,8 +229,8 @@ check_backup_retention() {
 }
 
 get_completed_managed_backup_count() {
-  kubectl get sgbackup -n "$CLUSTER_NAMESPACE" -o custom-columns=PHASE:.status.process.status \
-    | grep 'Completed' | wc -l
+  kubectl get sgbackup -n "$CLUSTER_NAMESPACE" -o custom-columns=PHASE:.status.process.status,MANAGED:.spec.managedLifecycle \
+    | tr -s ' ' | grep -xF 'Completed true' | wc -l
 }
 
 enable_cluster_cron_schedule() {

stackgres-k8s/e2e/spec/previous/1.13/spec/stream-to-cloudevent.files/index.js

@@ -254,4 +254,10 @@ check_major_version_upgrade_check() {
   check_mock_data_samehost "$CLUSTER_NAME"
   wait_until run_query -i 1 -q "SELECT 1;"
   check_mock_data_replication "$CLUSTER_NAME"
+  if kubectl exec -ti -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -q -w -h localhost -p 5432 -c 'SELECT 1'
+  then
+    fail "was possible to connect to the cluster without password"
+  else
+    success "was not possible to connect to the cluster without password"
+  fi
 }