Merge pull request #255 from vshn/fix-provisioning

Fix pg-conf naming issues
vshn · Oct 30, 2024 · 6fc81c1 · 6fc81c1
2 parents 454080f + e331de7
commit 6fc81c1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pkg/comp-functions/functions/vshnpostgres/delay_cluster.go b/pkg/comp-functions/functions/vshnpostgres/delay_cluster.go
@@ -48,7 +48,7 @@ func DelayClusterDeployment(_ context.Context, comp *vshnv1.VSHNPostgreSQL, svc
 		return runtime.NewWarningResult("SGObjectStorage is not yet ready, skipping creation of cluster")
 	}
 
-	if !kubeObjectSyncedAndReady("pg-conf", svc) {
+	if !kubeObjectSyncedAndReady(comp.GetName()+"-"+configResourceName, svc) {
 		return runtime.NewWarningResult("SGPostgresConfig is not yet ready, skipping creation of cluster")
 	}
 

diff --git a/pkg/comp-functions/functions/vshnpostgres/extensions.go b/pkg/comp-functions/functions/vshnpostgres/extensions.go
@@ -88,7 +88,7 @@ func enableTimescaleDB(ctx context.Context, svc *runtime.ServiceRuntime, name st
 
 	config := &stackgresv1.SGPostgresConfig{}
 
-	err := svc.GetDesiredKubeObject(config, configResourceName)
+	err := svc.GetDesiredKubeObject(config, name+"-"+configResourceName)
 	if err != nil && err == runtime.ErrNotFound {
 		controllerruntime.LoggerFrom(ctx).Info("no pg-conf found")
 		return nil
@@ -112,7 +112,7 @@ func disableTimescaleDB(ctx context.Context, svc *runtime.ServiceRuntime, name s
 
 	config := &stackgresv1.SGPostgresConfig{}
 
-	err := svc.GetDesiredKubeObject(config, configResourceName)
+	err := svc.GetDesiredKubeObject(config, name+"-"+configResourceName)
 	if err != nil && err == runtime.ErrNotFound {
 		controllerruntime.LoggerFrom(ctx).Info("no pg-conf found")
 		return nil

diff --git a/pkg/comp-functions/functions/vshnpostgres/extensions_test.go b/pkg/comp-functions/functions/vshnpostgres/extensions_test.go
@@ -81,14 +81,14 @@ func Test_disableTimescaleDB(t *testing.T) {
 		svc := commontest.LoadRuntimeFromFile(t, tt.iofFile)
 
 		t.Run(tt.name, func(t *testing.T) {
-			if err := disableTimescaleDB(ctx, svc, configResourceName); (err != nil) != tt.wantErr {
+			if err := disableTimescaleDB(ctx, svc, "pgsql-gc9x4"); (err != nil) != tt.wantErr {
 				t.Errorf("disableTimescaleDB() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 
 		config := &stackgresv1.SGPostgresConfig{}
 
-		assert.NoError(t, svc.GetDesiredKubeObject(config, configResourceName))
+		assert.NoError(t, svc.GetDesiredKubeObject(config, "pgsql-gc9x4-"+configResourceName))
 
 		assert.NotContains(t, config.Spec.PostgresqlConf[sharedLibraries], timescaleExtName)
 

diff --git a/test/functions/vshn-postgres/delay_cluster/01_GivenAllDependencies.yaml b/test/functions/vshn-postgres/delay_cluster/01_GivenAllDependencies.yaml
@@ -100,7 +100,7 @@ observed:
               reason: ReconcileSuccess
               status: 'True'
               type: Synced
-    pg-conf:
+    pgsql-gc9x4-pg-conf:
       resource:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object

diff --git a/test/functions/vshn-postgres/extensions/01-GivenAlreadyEnabled.yaml b/test/functions/vshn-postgres/extensions/01-GivenAlreadyEnabled.yaml
@@ -23,7 +23,7 @@ desired:
         writeConnectionSecretToRef: {}
       status: {}
   resources:
-    pg-conf:
+    pgsql-gc9x4-pg-conf:
       resource:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object

diff --git a/test/functions/vshn-postgres/extensions/01-GivenFreshConfig.yaml b/test/functions/vshn-postgres/extensions/01-GivenFreshConfig.yaml
@@ -23,7 +23,7 @@ desired:
         writeConnectionSecretToRef: {}
       status: {}
   resources:
-    pg-conf:
+    pgsql-gc9x4-pg-conf:
       resource:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object