Merge pull request #274 from vshn/fix/scaling_pg_issue

Set the correct version for the SGCluster
vshn · Dec 3, 2024 · 90a90f4 · 90a90f4
2 parents 237beb2 + 99ff753
commit 90a90f4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/pkg/comp-functions/functions/vshnpostgres/maintenance.go b/pkg/comp-functions/functions/vshnpostgres/maintenance.go
@@ -14,6 +14,7 @@ import (
 	"github.com/vshn/appcat/v4/pkg/comp-functions/runtime"
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 )
@@ -129,6 +130,11 @@ func addSchedules(ctx context.Context, comp *vshnv1.VSHNPostgreSQL, svc *runtime
 		},
 	}...)
 
+	err = setPsqlMinorVersion(svc, cluster)
+	if err != nil {
+		return runtime.NewWarningResult(fmt.Errorf("cannot set the minor version for the PostgreSQL instance: %w", err).Error())
+	}
+
 	backups := *cluster.Spec.Configurations.Backups
 	backups[0].CronSchedule = ptr.To(comp.GetBackupSchedule())
 	cluster.Spec.Configurations.Backups = &backups
@@ -178,3 +184,21 @@ func createMaintenanceSecret(instanceNamespace, sgNamespace, resourceName string
 		},
 	}
 }
+
+func setPsqlMinorVersion(svc *runtime.ServiceRuntime, desiredCluster *stackgresv1.SGCluster) error {
+	observedCluster := &stackgresv1.SGCluster{}
+	err := svc.GetObservedKubeObject(observedCluster, "cluster")
+	if errors.IsNotFound(err) {
+		// Cluster doesn't exist yet. So let's ignore it here
+		return nil
+	}
+	if err != nil {
+		return fmt.Errorf("cannot get observed cluster object: %w", err)
+	}
+
+	pgVersion := observedCluster.Spec.Postgres.Version
+
+	desiredCluster.Spec.Postgres.Version = pgVersion
+
+	return nil
+}
diff --git a/pkg/comp-functions/functions/vshnpostgres/postgresql_deploy_test.go b/pkg/comp-functions/functions/vshnpostgres/postgresql_deploy_test.go
@@ -59,7 +59,6 @@ func TestPostgreSqlDeploy(t *testing.T) {
 	assert.Equal(t, comp.GetName(), cluster.Name)
 	assert.Equal(t, comp.GetInstanceNamespace(), cluster.Namespace)
 	assert.Equal(t, comp.Spec.Parameters.Instances, cluster.Spec.Instances)
-	assert.Equal(t, comp.Spec.Parameters.Service.MajorVersion, cluster.Spec.Postgres.Version)
 	assert.Nil(t, cluster.Spec.InitialData.Restore)
 	assert.Equal(t, comp.GetName(), *cluster.Spec.SgInstanceProfile)
 	assert.Equal(t, comp.GetName(), *cluster.Spec.Configurations.SgPostgresConfig)

diff --git a/test/functions/vshn-postgres/deploy/01_default.yaml b/test/functions/vshn-postgres/deploy/01_default.yaml
@@ -282,7 +282,7 @@ observed:
                     privateKeySecretKeySelector:
                       key: tls.key
                       name: tls-certificate
-                  version: "15"
+                  version: "15.1"
                 sgInstanceProfile: psql-gc9x4
           managementPolicy: Default
           providerConfigRef: