Revert "fixing objectname, so it's easier to debug"

This reverts commit 4d456ee.
vshn · Aug 14, 2023 · 4b71087 · 4b71087
1 parent 4d456ee
commit 4b71087
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer.go b/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer.go
@@ -55,15 +55,15 @@ func AddLoadBalancerIPToConnectionDetails(ctx context.Context, iof *runtime.Runt
 		k8sservice.Spec.Type = v1.ServiceTypeClusterIP
 	}
 
-	if err := iof.Desired.PutIntoObject(ctx, k8sservice, fmt.Sprintf("%s-%s", comp.GetName(), "service")); err != nil {
+	if err := iof.Desired.PutIntoObject(ctx, k8sservice, fmt.Sprintf("%s-%s", comp.GetName(), serviceName)); err != nil {
 		return runtime.NewFatalErr(ctx, "Cannot put service into function io", err)
 	}
 
 	if comp.Spec.Parameters.Network.ServiceType == "ClusterIP" {
 		return runtime.NewNormal()
 	}
 
-	k8sservice, err = getObservedService(ctx, iof, k8sservice, fmt.Sprintf("%s-%s", comp.GetName(), "service"))
+	k8sservice, err = getObservedService(ctx, iof, k8sservice, fmt.Sprintf("%s-%s", comp.GetName(), serviceName))
 	if err != nil {
 		return runtime.NewWarning(ctx, "Cannot yet get service object")
 	}

diff --git a/test/transforms/vshn-postgres/loadbalancer/02-ServiceObserverPresent.yaml b/test/transforms/vshn-postgres/loadbalancer/02-ServiceObserverPresent.yaml
@@ -183,7 +183,7 @@ observed:
             name: postgresql-prod-n97jr-connection
           - apiVersion: kubernetes.crossplane.io/v1alpha1
             kind: Object
-            name: postgresql-prod-n97jr-service
+            name: postgresql-prod-n97jr-postgresql-master
           - apiVersion: kubernetes.crossplane.io/v1alpha1
             kind: Object
             name: postgresql-prod-n97jr-localca
@@ -780,16 +780,16 @@ observed:
               status: "True"
               type: Synced
       connectionDetails: []
-    - name: postgresql-prod-n97jr-service
+    - name: postgresql-prod-n97jr-postgresql-master
       resource:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object
         metadata:
           annotations:
-            crossplane.io/composition-resource-name: postgresql-prod-n97jr-service
+            crossplane.io/composition-resource-name: postgresql-prod-n97jr-postgresql-master
             crossplane.io/external-create-pending: 2023-07-28T09:05:56Z
             crossplane.io/external-create-succeeded: 2023-07-28T09:05:57Z
-            crossplane.io/external-name: postgresql-prod-n97jr-service
+            crossplane.io/external-name: postgresql-prod-n97jr-postgresql-master
           creationTimestamp: 2023-07-28T09:05:55Z
           finalizers:
             - finalizer.managedresource.crossplane.io
@@ -907,7 +907,7 @@ observed:
               operation: Update
               subresource: status
               time: 2023-07-28T09:06:03Z
-          name: postgresql-prod-n97jr-service
+          name: postgresql-prod-n97jr-postgresql-master
           ownerReferences:
             - apiVersion: vshn.appcat.vshn.io/v1
               blockOwnerDeletion: true