fix: minor version upgrade SGDbOps fails to perform minor version upgrade

Author: teoincontatto

stackgres-k8s/e2e/spec/dbops-minor-version-upgrade

@@ -79,9 +79,9 @@ check_minor_version_upgrade() {
   assert_dbops_completion "$DBOPS_NAME" "$CLUSTER_NAMESPACE" "$((E2E_TIMEOUT * 2))"
 
   if [ "$(kubectl get pod -n "$CLUSTER_NAMESPACE" \
-      -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true"
-      --template '{{ range .spec.containers }}{{ printf "%s\n" .image }}{{ end }}' \
-    | grep ".-pg${E2E_MINOR_TARGET_POSTGRES_VERSION}-" \
+      -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true" \
+      --template '{{ range .items }}{{ range .spec.containers }}{{ printf "%s\n" .image }}{{ end }}{{ end }}' \
+    | grep -F -- "-pg${E2E_MINOR_TARGET_POSTGRES_VERSION}-" \
     | wc -l)" = 2 ]
   then
     success "Postgres minor version was updated"

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/DbOpsUtil.java

@@ -14,6 +14,7 @@
 
 import io.stackgres.common.crd.Condition;
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
+import io.stackgres.common.crd.sgdbops.DbOpsOperation;
 import io.stackgres.common.crd.sgdbops.DbOpsStatusCondition;
 import io.stackgres.common.crd.sgdbops.DbOpsStatusCondition.Status;
 import io.stackgres.common.crd.sgdbops.DbOpsStatusCondition.Type;
@@ -25,9 +26,9 @@
 public interface DbOpsUtil {
 
   List<String> ROLLOUT_OPS = List.of(
-      "restart",
-      "securityUpgrade",
-      "minorVersionUpgrade");
+      DbOpsOperation.RESTART.toString(),
+      DbOpsOperation.SECURITY_UPGRADE.toString(),
+      DbOpsOperation.MINOR_VERSION_UPGRADE.toString());
 
   Pattern UPPERCASE_LETTER_PATTERN = Pattern.compile("([A-Z])");
 

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsStatusManager.java

@@ -14,22 +14,27 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.Endpoints;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodSpec;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSetStatus;
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
 import io.fabric8.kubernetes.api.model.batch.v1.JobStatus;
 import io.stackgres.common.PatroniUtil;
 import io.stackgres.common.StackGresContext;
+import io.stackgres.common.StackGresProperty;
+import io.stackgres.common.StackGresUtil;
 import io.stackgres.common.crd.Condition;
 import io.stackgres.common.crd.sgcluster.ClusterDbOpsRestartStatus;
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
 import io.stackgres.common.crd.sgcluster.StackGresClusterDbOpsStatus;
 import io.stackgres.common.crd.sgcluster.StackGresClusterStatus;
 import io.stackgres.common.crd.sgdbops.DbOpsMethodType;
+import io.stackgres.common.crd.sgdbops.DbOpsOperation;
 import io.stackgres.common.crd.sgdbops.DbOpsRestartStatus;
 import io.stackgres.common.crd.sgdbops.DbOpsStatusCondition;
 import io.stackgres.common.crd.sgdbops.StackGresDbOps;
@@ -163,10 +168,49 @@ private void updateRolloutBasedDbOps(StackGresDbOps source) {
         .filter(pod -> !ClusterRolloutUtil.getRestartReasons(
             cluster, statefulSet, pod, patroniMembers).requiresRestart())
         .toList();
+    final boolean securityUpgradeWasApplied;
+    if (Objects.equals(
+        DbOpsOperation.SECURITY_UPGRADE.toString(),
+        source.getSpec().getOp())) {
+      securityUpgradeWasApplied = podsReadyAndUpdated
+          .stream()
+          .allMatch(pod -> Optional.of(pod)
+              .map(Pod::getMetadata)
+              .map(ObjectMeta::getAnnotations)
+              .map(Map::entrySet)
+              .stream()
+              .flatMap(Set::stream)
+              .anyMatch(Map.entry(
+                  StackGresContext.VERSION_KEY,
+                  StackGresProperty.OPERATOR_VERSION.getString())::equals));
+    } else {
+      securityUpgradeWasApplied = true;
+    }
+    final boolean minorVersionUpgradeWasApplied;
+    if (Objects.equals(
+        DbOpsOperation.MINOR_VERSION_UPGRADE.toString(),
+        source.getSpec().getOp())) {
+      final String targetPatroniImage = StackGresUtil.getPatroniImageName(
+          cluster,
+          source.getSpec().getMinorVersionUpgrade().getPostgresVersion());
+      minorVersionUpgradeWasApplied = podsReadyAndUpdated
+          .stream()
+          .allMatch(pod -> Optional.of(pod)
+              .map(Pod::getSpec)
+              .map(PodSpec::getContainers)
+              .stream()
+              .flatMap(List::stream)
+              .map(Container::getImage)
+              .anyMatch(targetPatroniImage::equals));
+    } else {
+      minorVersionUpgradeWasApplied = true;
+    }
     if (source.getStatus() == null) {
       source.setStatus(new StackGresDbOpsStatus());
     }
     if ((primaryIsReadyAndUpdated || primaryIsExternal)
+        && securityUpgradeWasApplied
+        && minorVersionUpgradeWasApplied
         && pods.size() == podsReadyAndUpdated.size()) {
       updateCondition(getRolloutCompleted(), source);
       if (Optional.ofNullable(cluster.getMetadata().getAnnotations())