Merge branch '20240206-fixes' into 'main'

🚆 Fix Train 06-02-2025

See merge request ongresinc/stackgres!1651

Author: teoincontatto

stackgres-k8s/install/helm/stackgres-operator/templates/check-upgrade.yaml

@@ -9,7 +9,7 @@
       {{ $version := $deployment.metadata.labels.version }}
       {{ if not .Values.forceUpgradeFromUnsupportedVersion }}
         {{ if or (not (regexMatch "^(1\\.14|1\\.15|1\\.16)\\." $version)) (and (not (eq $version $chart.Version)) (regexMatch "(-alpha[0-9]|-beta[0-9])" $version)) }}
-          {{ fail (print "Upgrading from version " $version " version is not supported. You may force upgrading from an unsupported version setting the parameter \"forceUpgradeFromUnsupportedVersion\" to \"true\". If you do so do it at your own risk. It has not been tested and some functionality may break. If you are conscious of the risk of such a dangerous action we recommend to perform security upgrades of all your SGCluster and SGShardedCluster as soon as possible after upgrading from an unsupported version of the operator upgrade") }}
+          {{ fail (print "Upgrading from version " $version " version is not supported. You may force upgrading from an unsupported version setting the parameter \"forceUpgradeFromUnsupportedVersion\" to \"true\". If you do so do it at your own risk. It has not been tested and some or all functionalities may break. Before proceeding you will have to change the value of `stackgres.io/operatorVersion` annotation of all your SGClusters and SGShardedClusters to the target operator version you want to upgrade to and,  as soon as possible after upgrading, perform a restart restart SGDbOps or SGShardedDbOps of all your SGClusters and SGShardedClusters. Before assuming the risk of such a dangerous action we strongly recommend to perform this operation in a staging environment as close as possible to your production environment.") }}
         {{ end }}
       {{ end }}
     {{ end }}
@@ -23,7 +23,11 @@
         {{ if (index $shardedcluster.metadata.annotations "stackgres.io/operatorVersion") }}
           {{ $version := (index $shardedcluster.metadata.annotations "stackgres.io/operatorVersion") }}
           {{ if (not (regexMatch "^(1\\.14|1\\.15|1\\.16)\\." $version)) }}
-            {{ fail (print "Can not upgrade due to some SGShardedCluster still at version " $version ". You have to run a SGShardedDbOps of type securityUpgrade on those SGShardedClusters first.") }}
+            {{ if not .Values.forceUpgradeFromUnsupportedVersion }}
+              {{ fail (print "Can not upgrade due to some SGShardedCluster still at version " $version ". You have to run a SGShardedDbOps of type securityUpgrade on those SGShardedClusters first.") }}
+            {{ else }}
+              {{ fail (print "Can not upgrade due to some SGShardedCluster still at version " $version ". Before proceeding you will have to change the value of `stackgres.io/operatorVersion` annotation of all your SGShardedClusters to the target operator version you want to upgrade to and,  as soon as possible after upgrading, perform a restart SGShardedDbOps of all your SGShardedClusters. Before assuming the risk of such a dangerous action we strongly recommend to perform this operation in a staging environment as close as possible to your production environment.") }}
+            {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
@@ -38,7 +42,11 @@
         {{ if (index $cluster.metadata.annotations "stackgres.io/operatorVersion") }}
           {{ $version := (index $cluster.metadata.annotations "stackgres.io/operatorVersion") }}
           {{ if (not (regexMatch "^(1\\.14|1\\.15|1\\.16)\\." $version)) }}
-            {{ fail (print "Can not upgrade due to some SGCluster still at version " $version ". You have to run a SGDbOps of type securityUpgrade on those SGClusters first.") }}
+            {{ if not .Values.forceUpgradeFromUnsupportedVersion }}
+              {{ fail (print "Can not upgrade due to some SGCluster still at version " $version ". You have to run a SGDbOps of type securityUpgrade on those SGClusters first.") }}
+            {{ else }}
+              {{ fail (print "Can not upgrade due to some SGCluster still at version " $version ". Before proceeding you will have to change the value of `stackgres.io/operatorVersion` annotation of all your SGClusters to the target operator version you want to upgrade to and,  as soon as possible after upgrading, perform a restart SGDbOps of all your SGClusters. Before assuming the risk of such a dangerous action we strongly recommend to perform this operation in a staging environment as close as possible to your production environment.") }}
+            {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}

stackgres-k8s/install/helm/stackgres-operator/values.yaml

@@ -545,8 +545,8 @@ developer:
       volumes: []
       # -- Pod's container volume mounts. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volumemount-v1-core
       volumeMounts: []
-    # Section to define volumes to be used by the distributedlogs controller container
-    distributedlogsController:
+    # Section to define volumes to be used by the stream container
+    stream:
       # -- Pod volumes. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volume-v1-core
       volumes: []
       # -- Pod's container volume mounts. See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#volumemount-v1-core

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliatorWorkerThreadPool.java

@@ -213,7 +213,11 @@ void executeReconciliation(ReconciliationRunnable r) {
             LOGGER.trace("{} has been scheduled to be reconcilied",
                 r);
           }
-          toExecuteReconciliations.stream().filter(r::equals).forEach(this::execute);
+          toExecuteReconciliations.forEach(ter -> {
+            if (ter.equals(r)) {
+              this.execute(ter);
+            }
+          });
           toExecuteReconciliations.remove(r);
         }
       }

stackgres-k8s/src/operator/src/main/resources/templates/run-major-version-upgrade.sh

@@ -609,17 +609,17 @@ rollback_major_version_upgrade() {
 
   if [ -z "$SOURCE_BACKUP_PATH" ]
   then
-    echo "Rollback major version upgrade by setting postgres version to $SOURCE_VERSION, postgres config to $SOURCE_POSTGRES_CONFIG and replication mode to $SOURCE_REPLICATION_MODE..."
+    echo "Rollback major version upgrade by setting postgres version to $SOURCE_VERSION, postgres config to $SOURCE_POSTGRES_CONFIG and replication mode to async..."
   else
-    echo "Rollback major version upgrade by setting postgres version to $SOURCE_VERSION, postgres config to $SOURCE_POSTGRES_CONFIG, replication mode to $SOURCE_REPLICATION_MODE and backup path to $SOURCE_BACKUP_PATH..."
+    echo "Rollback major version upgrade by setting postgres version to $SOURCE_VERSION, postgres config to $SOURCE_POSTGRES_CONFIG, replication mode to async and backup path to $SOURCE_BACKUP_PATH..."
   fi
   echo
   until {
     CLUSTER="$({ kubectl get "$CLUSTER_CRD_NAME.$CRD_GROUP" -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" -o json || printf .; } | jq -c .)"
     CLUSTER="$(printf '%s' "$CLUSTER" | jq -c '.spec.postgres.version = "'"$SOURCE_VERSION"'"')"
     CLUSTER="$(printf '%s' "$CLUSTER" | jq -c '.spec.postgres.extensions = '"$SOURCE_EXTENSIONS")"
     CLUSTER="$(printf '%s' "$CLUSTER" | jq -c '.spec.configurations.sgPostgresConfig = "'"$SOURCE_POSTGRES_CONFIG"'"')"
-    CLUSTER="$(printf '%s' "$CLUSTER" | jq -c '.spec.replication.mode = "'"$SOURCE_REPLICATION_MODE"'"')"
+    CLUSTER="$(printf '%s' "$CLUSTER" | jq -c '.spec.replication.mode = "async"')"
     if [ -n "$SOURCE_BACKUP_PATH" ]
     then
       CLUSTER="$(printf '%s' "$CLUSTER" | jq -c '