Merge branch 'main' into bha-cpumemlimits

Author: Bhagyashreek8

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-06-12T11:19:05Z",
+  "generated_at": "2024-06-25T08:10:41Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"

controllers/fake/client_get/pvc/client.go renamed to controllers/fake/client_list/deploymentpod/client.go

@@ -454,39 +454,34 @@ func (t versionedTracker) update(gvr schema.GroupVersionResource, obj runtime.Ob
 }
 
 func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
-	switch obj.(type) {
-	case *corev1.PersistentVolumeClaim:
-		return errors.New("failed to get persistentvolumeclaim")
-	default:
-		gvr, err := getGVRFromObject(obj, c.scheme)
+	gvr, err := getGVRFromObject(obj, c.scheme)
+	if err != nil {
+		return err
+	}
+	o, err := c.tracker.Get(gvr, key.Namespace, key.Name)
+	if err != nil {
+		return err
+	}
+
+	if _, isUnstructured := obj.(runtime.Unstructured); isUnstructured {
+		gvk, err := apiutil.GVKForObject(obj, c.scheme)
 		if err != nil {
 			return err
 		}
-		o, err := c.tracker.Get(gvr, key.Namespace, key.Name)
+		ta, err := meta.TypeAccessor(o)
 		if err != nil {
 			return err
 		}
+		ta.SetKind(gvk.Kind)
+		ta.SetAPIVersion(gvk.GroupVersion().String())
+	}
 
-		if _, isUnstructured := obj.(runtime.Unstructured); isUnstructured {
-			gvk, err := apiutil.GVKForObject(obj, c.scheme)
-			if err != nil {
-				return err
-			}
-			ta, err := meta.TypeAccessor(o)
-			if err != nil {
-				return err
-			}
-			ta.SetKind(gvk.Kind)
-			ta.SetAPIVersion(gvk.GroupVersion().String())
-		}
-
-		j, err := json.Marshal(o)
-		if err != nil {
-			return err
-		}
-		zero(obj)
-		return json.Unmarshal(j, obj)
+	j, err := json.Marshal(o)
+	if err != nil {
+		return err
 	}
+	zero(obj)
+	return json.Unmarshal(j, obj)
 }
 
 func (c *fakeClient) Watch(ctx context.Context, list client.ObjectList, opts ...client.ListOption) (watch.Interface, error) {
@@ -505,6 +500,16 @@ func (c *fakeClient) Watch(ctx context.Context, list client.ObjectList, opts ...
 }
 
 func (c *fakeClient) List(ctx context.Context, obj client.ObjectList, opts ...client.ListOption) error {
+	listOpts := client.ListOptions{}
+	listOpts.ApplyOptions(opts)
+
+	switch obj.(type) {
+	case *corev1.PodList:
+		if listOpts.Namespace == "default" {
+			return errors.New("failed to list object")
+		}
+	}
+
 	gvk, err := apiutil.GVKForObject(obj, c.scheme)
 	if err != nil {
 		return err
@@ -522,9 +527,6 @@ func (c *fakeClient) List(ctx context.Context, obj client.ObjectList, opts ...cl
 		c.schemeWriteLock.Unlock()
 	}
 
-	listOpts := client.ListOptions{}
-	listOpts.ApplyOptions(opts)
-
 	gvr, _ := meta.UnsafeGuessKindToResource(gvk)
 	o, err := c.tracker.List(gvr, gvk, listOpts.Namespace)
 	if err != nil {

controllers/fake/client_list/nodeserverpod/client.go

@@ -31,6 +31,7 @@ import (
 	"time"
 
 	// Using v4 to match upstream
+	"github.com/IBM/ibm-object-csi-driver-operator/controllers/constants"
 	jsonpatch "github.com/evanphx/json-patch/v5"
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
@@ -505,7 +506,7 @@ func (c *fakeClient) List(ctx context.Context, obj client.ObjectList, opts ...cl
 
 	switch obj.(type) {
 	case *corev1.PodList:
-		if strings.Contains(listOpts.Namespace, "test") {
+		if listOpts.Namespace == constants.CSIOperatorNamespace {
 			return errors.New("failed to list object")
 		}
 	}