fix(GcpNfsVolumeBackup/Restore) optional nfsvolume ref namespace

ravi-shankar-sap · Sep 5, 2024 · e4a874b · e4a874b
1 parent abf3e2f
commit e4a874b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/pkg/skr/gcpnfsvolumebackup/loadGcpNfsVolume.go b/pkg/skr/gcpnfsvolumebackup/loadGcpNfsVolume.go
@@ -2,13 +2,11 @@ package gcpnfsvolumebackup
 
 import (
 	"context"
+	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
 	cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-resources/v1beta1"
+	"github.com/kyma-project/cloud-manager/pkg/composed"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-
-	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
-	"github.com/kyma-project/cloud-manager/pkg/composed"
 )
 
 func loadGcpNfsVolume(ctx context.Context, st composed.State) (error, context.Context) {
@@ -30,10 +28,7 @@ func loadGcpNfsVolume(ctx context.Context, st composed.State) (error, context.Co
 
 	//Load the nfsVolume object
 	nfsVolume := &cloudresourcesv1beta1.GcpNfsVolume{}
-	nfsVolumeKey := types.NamespacedName{
-		Name:      backup.Spec.Source.Volume.Name,
-		Namespace: backup.Spec.Source.Volume.Namespace,
-	}
+	nfsVolumeKey := backup.Spec.Source.Volume.ToNamespacedName(backup.Namespace)
 	err := state.SkrCluster.K8sClient().Get(ctx, nfsVolumeKey, nfsVolume)
 	if err != nil {
 		backup.Status.State = cloudresourcesv1beta1.GcpNfsBackupError

diff --git a/pkg/skr/gcpnfsvolumerestore/loadGcpNfsVolume.go b/pkg/skr/gcpnfsvolumerestore/loadGcpNfsVolume.go
@@ -5,7 +5,6 @@ import (
 	cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-resources/v1beta1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1"
@@ -26,10 +25,7 @@ func loadGcpNfsVolume(ctx context.Context, st composed.State) (error, context.Co
 
 	//Load the nfsVolume object
 	nfsVolume := &cloudresourcesv1beta1.GcpNfsVolume{}
-	nfsVolumeKey := types.NamespacedName{
-		Name:      restore.Spec.Destination.Volume.Name,
-		Namespace: restore.Spec.Destination.Volume.Namespace,
-	}
+	nfsVolumeKey := restore.Spec.Destination.Volume.ToNamespacedName(restore.Namespace)
 	err := state.SkrCluster.K8sClient().Get(ctx, nfsVolumeKey, nfsVolume)
 	if client.IgnoreNotFound(err) != nil {
 		return composed.LogErrorAndReturn(err, "Error loading SKR GcpNfsVolume", composed.StopWithRequeue, ctx)