version: 1.19.0-SNAPSHOT

Author: teoincontatto

.gitlab/Release.md.template

@@ -43,7 +43,7 @@ EOF
     sh -x stackgres-k8s/ci/utils/update-version.sh "${VERSION}"
     ```
 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
-1. [ ] Add ${VERSION} section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
+1. [ ] Add ${VERSION} section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
 1. [ ] Check the changes to ensure everything is correct before commit:
     ```
     git diff
@@ -246,15 +246,7 @@ $(
     ```
     git push origin add-version-${NEXT_MINOR_VERSION}
     ```
-1. [ ] Wait for the pipeline of `add-version-${NEXT_MINOR_VERSION}` branch to complete
-1. [ ] Merge local branch `add-version-${NEXT_MINOR_VERSION}` into `main`:
-    ```
-    git checkout main && git pull && git merge --ff-only add-version-${NEXT_MINOR_VERSION}
-    ```
-1. [ ] Push `main` to origin:
-    ```
-    git push
-    ```
+1. [ ] Create a MR using the link provided by the previous command (against the `main` branch) and merge it when all checks pass.
 1. [ ] Change scheduled pipeline description and `STACKGRES_PREVIOUS_VERSION` environment variable to test upgrade from version `${TO_REMOVE_MINOR_VERSION}` to version `${MINOR_VERSION}`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules/237754/edit?id=237754
 1. [ ] Change scheduled pipeline description and `STACKGRES_VERSION` environment variable to test from version `${TO_REMOVE_MINOR_VERSION}` to version `${MINOR_VERSION}`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules/262456/edit?id=262456 or https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules/235791/edit?id=235791
 EOF

.gitlab/issue_templates/Beta Release.md

@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
     sh -x stackgres-k8s/ci/utils/update-version.sh "1.18.0-beta1"
     ```
 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
-1. [ ] Add 1.18.0-beta1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
+1. [ ] Add 1.18.0-beta1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
 1. [ ] Check the changes to ensure everything is correct before commit:
     ```
     git diff

.gitlab/issue_templates/GA Release.md

@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
     sh -x stackgres-k8s/ci/utils/update-version.sh "1.18.0"
     ```
 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
-1. [ ] Add 1.18.0 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
+1. [ ] Add 1.18.0 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
 1. [ ] Check the changes to ensure everything is correct before commit:
     ```
     git diff

.gitlab/issue_templates/Patch Release.md

@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
     sh -x stackgres-k8s/ci/utils/update-version.sh "1.17.5"
     ```
 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
-1. [ ] Add 1.17.5 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
+1. [ ] Add 1.17.5 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
 1. [ ] Check the changes to ensure everything is correct before commit:
     ```
     git diff

.gitlab/issue_templates/RC Release.md

@@ -29,7 +29,7 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION
     sh -x stackgres-k8s/ci/utils/update-version.sh "1.18.0-rc2"
     ```
 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`)
-1. [ ] Add 1.18.0-rc2 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties`
+1. [ ] Add 1.18.0-rc2 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions-${VERSION%.*}.properties`
 1. [ ] Check the changes to ensure everything is correct before commit:
     ```
     git diff

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

@@ -28,7 +28,7 @@ e2e_test_install() {
   VERSION_AS_NUMBER_1_15_0="$(get_version_as_number 1.15.0-SNAPSHOT)"
   VERSION_AS_NUMBER_1_16_0="$(get_version_as_number 1.16.0-SNAPSHOT)"
   VERSION_AS_NUMBER_1_17_0="$(get_version_as_number 1.17.0-SNAPSHOT)"
-  VERSION_AS_NUMBER_1_18_0="$(get_version_as_number 1.18.0-SNAPSHOT)"
+  VERSION_AS_NUMBER_1_17_2="$(get_version_as_number 1.17.2-SNAPSHOT)"
 
   CLUSTER_CRD="sgclusters.stackgres.io"
 
@@ -51,7 +51,7 @@ e2e_test_install() {
   PREVIOUS_PATRONI_IMAGE="$(printf %s "$PREVIOUS_PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg')"
   if [ "$PREVIOUS_VERSION_AS_NUMBER" -ge "$VERSION_AS_NUMBER_1_15_0" ]
   then
-    PREVIOUS_DISTRIBUTEDLOGS_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | tail -n 1)"
+    PREVIOUS_DISTRIBUTEDLOGS_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg17\.')"
   else
     PREVIOUS_DISTRIBUTEDLOGS_PATRONI_IMAGE="$(printf '%s' "$PREVIOUS_PATRONI_IMAGE" | grep '/patroni\(-ext\)\?:v[0-9.]\+-pg12\.')"
   fi
@@ -784,36 +784,9 @@ check_cluster_before_security_upgrade() {
         | del(.postgresql.pg_hba)
         ')"
     fi
-    jq -Sc '.
-      | if .synchronous_mode then . else del(.synchronous_node_count) end
-      | .postgresql.parameters = (.postgresql.parameters
-        | if .ssl == null then .ssl = "on" else . end
-        | if .ssl_cert_file == null then .ssl_cert_file = "/etc/ssl/tls.crt" else . end
-        | if .ssl_key_file == null then .ssl_key_file = "/etc/ssl/tls.key" else . end
-        | if .port == null then .port = "5432" else . end
-        | if .autovacuum_vacuum_cost_delay == "2" then .autovacuum_vacuum_cost_delay = "2ms" else . end
-        | if .checkpoint_timeout == "30" then .checkpoint_timeout = "30s" else . end
-        | if .log_autovacuum_min_duration == "0" then .log_autovacuum_min_duration = "0ms" else . end
-        | if .log_min_duration_statement == "1000" then .log_min_duration_statement = "1s" else . end
-        | if .log_rotation_age == "30" then .log_rotation_age = "30min" else . end
-        | if .log_rotation_size == "0" then .log_rotation_size = "0kB" else . end
-        | if .log_temp_files == "0" then .log_temp_files = "0kB" else . end
-        | if .track_activity_query_size == "4096" then .track_activity_query_size = "4kB" else . end
-        | if .restore_command != null then .restore_command = null else . end)
-        | .postgresql.recovery_conf = (if .postgresql.recovery_conf == null
-          then { restore_command: "exec-with-env '"'backup'"' -- wal-g wal-fetch %f %p" }
-          else .postgresql.recovery_conf end)
-      | if (.postgresql | has("use_slots"))
-        then .
-        else .postgresql.use_slots = true end
-      ' "$PREVIOUS_PATRONI_CONFIG_PATH" > "$LOG_PATH/previous-patroni-config-filtered.json"
+    PATRONI_CONFIG="$(printf %s "$PATRONI_CONFIG" | normalize_patroni_config)"
+    normalize_patroni_config "$PREVIOUS_PATRONI_CONFIG_PATH" > "$LOG_PATH/previous-patroni-config-filtered.json"
     PREVIOUS_PATRONI_CONFIG="$(cat "$LOG_PATH/previous-patroni-config-filtered.json")"
-    if [ "$CLUSTER_NAME" = "$DISTRIBUTEDLOGS_NAME" ]
-    then
-      PREVIOUS_PATRONI_CONFIG="$(printf '%s' "$PREVIOUS_PATRONI_CONFIG" | jq -Sc '. 
-        | del(.postgresql.recovery_conf)
-        ')"
-    fi
     if [ "$CLUSTER_NAME" = "$DISTRIBUTEDLOGS_NAME" ] \
       && [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_17_0" ]
     then
@@ -828,7 +801,7 @@ check_cluster_before_security_upgrade() {
         | del(.postgresql.parameters.ssl_key_file)
         ')"
     fi
-    if [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_18_0" ]
+    if [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_17_2" ]
     then
         PREVIOUS_PATRONI_CONFIG="$(printf '%s' "$PREVIOUS_PATRONI_CONFIG" | jq -Sc '. 
           | .postgresql.parameters.listen_addresses = "localhost,::1"
@@ -856,11 +829,10 @@ check_cluster_before_security_upgrade() {
     PGBOUNCER_CONFIG="$(kubectl get configmap -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-connection-pooling-config" --template '{{ index .data "pgbouncer.ini" }}')"
     PGBOUNCER_CONFIG="$(printf '%s' "$PGBOUNCER_CONFIG")"
     cat "$PREVIOUS_PGBOUNCER_CONFIG_PATH" \
-      | sed '\#^auth_user = #a client_tls_cert_file = /etc/ssl/tls.crt\nclient_tls_key_file = /etc/ssl/tls.key\nclient_tls_sslmode = prefer' \
       | sed '/server_check_query = ;/d' \
       | sed 's/stats_users = /server_check_query = ;\nstats_users = /' > "$LOG_PATH/previous-pgbouncer-config-filtered.ini"
     PREVIOUS_PGBOUNCER_CONFIG="$(cat "$LOG_PATH/previous-pgbouncer-config-filtered.ini")"
-    if [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_18_0" ]
+    if [ "$PREVIOUS_VERSION_AS_NUMBER" -lt "$VERSION_AS_NUMBER_1_17_2" ]
     then
         PGBOUNCER_CONFIG="$(printf '%s' "$PGBOUNCER_CONFIG" \
           | sed "s/listen_addr = [\"']\?127\.0\.0\.1.*/listen_addr = 127.0.0.1,::1/")"
@@ -1266,3 +1238,28 @@ check_returned_namespaces() {
   [ "$NAMESPACES_IN_RESPONSE" = "$NAMESPACES_IN_K8S" ]
 }
 
+normalize_patroni_config() {
+  jq -Sc '.
+    | if .synchronous_mode then . else del(.synchronous_node_count) end
+    | .postgresql.parameters = (.postgresql.parameters
+      | if .ssl == null then .ssl = "on" else . end
+      | if .ssl_cert_file == null then .ssl_cert_file = "/etc/ssl/tls.crt" else . end
+      | if .ssl_key_file == null then .ssl_key_file = "/etc/ssl/tls.key" else . end
+      | if .port == null then .port = "5432" else . end
+      | if .autovacuum_vacuum_cost_delay == "2" then .autovacuum_vacuum_cost_delay = "2ms" else . end
+      | if .checkpoint_timeout == "30" then .checkpoint_timeout = "30s" else . end
+      | if .log_autovacuum_min_duration == "0" then .log_autovacuum_min_duration = "0ms" else . end
+      | if .log_min_duration_statement == "1000" then .log_min_duration_statement = "1s" else . end
+      | if .log_rotation_age == "30" then .log_rotation_age = "30min" else . end
+      | if .log_rotation_size == "0" then .log_rotation_size = "0kB" else . end
+      | if .log_temp_files == "0" then .log_temp_files = "0kB" else . end
+      | if .track_activity_query_size == "4096" then .track_activity_query_size = "4kB" else . end
+      | if .restore_command != null then .restore_command = null else . end)
+      | .postgresql.recovery_conf = (if .postgresql.recovery_conf == null
+        then { restore_command: "exec-with-env '"'backup'"' -- wal-g wal-fetch %f %p" }
+        else .postgresql.recovery_conf end)
+    | if (.postgresql | has("use_slots"))
+      then .
+      else .postgresql.use_slots = true end
+    ' "$@"
+}

stackgres-k8s/e2e/spec/operator-helm

@@ -27,7 +27,7 @@ e2e_test() {
   run_test "Check that operator can be upgrade from 1st older minor version" check_operator_upgrade_first_old_minor
   run_test "Check that operator can be upgrade from 2nd older minor version" check_operator_upgrade_second_old_minor
   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 1st and 2nd older minot versions" check_operator_upgrade_with_cluster_using_first_and_second_old_versions
+  run_test "Check that operator can be upgrade with an SGCluster that uses 1st and 2nd older minor versions" check_operator_upgrade_with_cluster_using_first_and_second_old_versions
   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