Remove receiver from "GetObject()"-type funcs

linode · Jan 27, 2022 · a83ce96 · a83ce96
1 parent 570a09c
commit a83ce96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/e2e/test/csi_driver_test.go b/e2e/test/csi_driver_test.go
@@ -28,7 +28,7 @@ var _ = Describe("Linode CSI Driver", func() {
 			BeforeEach(func() {
 				f = root.Invoke()
 				By("Getting the StatefulSet manifest w/ non-root container")
-				sts = f.GetStatefulSetObject("redis-test", f.Namespace(), storageClass)
+				sts = framework.GetStatefulSetObject("redis-test", f.Namespace(), storageClass)
 
 				By("Creating the StatefulSet in the cluster")
 				Eventually(func() error {
@@ -183,13 +183,13 @@ var _ = Describe("Linode CSI Driver", func() {
 			JustBeforeEach(func() {
 				f = root.Invoke()
 				By("Creating the Persistent Volume Claim")
-				pvc = f.GetPersistentVolumeClaimObject("test-pvc", f.Namespace(), size, storageClass)
+				pvc = framework.GetPersistentVolumeClaimObject("test-pvc", f.Namespace(), size, storageClass)
 				Eventually(func() error {
 					return f.CreatePersistentVolumeClaim(pvc)
 				}, f.Timeout, f.RetryInterval).Should(Succeed())
 
 				By("Creating Pod with PVC")
-				pod = f.GetPodObject("busybox-test", f.Namespace(), pvc.Name)
+				pod = framework.GetPodObject("busybox-test", f.Namespace(), pvc.Name)
 				Eventually(func() error {
 					return f.CreatePod(pod)
 				}, f.Timeout, f.RetryInterval).Should(Succeed())

diff --git a/e2e/test/framework/pod.go b/e2e/test/framework/pod.go
@@ -10,7 +10,7 @@ import (
 	"kmodules.xyz/client-go/tools/exec"
 )
 
-func (f *Invocation) GetPodObject(name, namespace, pvc string) *core.Pod {
+func GetPodObject(name, namespace, pvc string) *core.Pod {
 	return &core.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,

diff --git a/e2e/test/framework/pvc.go b/e2e/test/framework/pvc.go
@@ -11,7 +11,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func (f *Invocation) GetPersistentVolumeClaimObject(name, namespace, size, storageClass string) *core.PersistentVolumeClaim {
+func GetPersistentVolumeClaimObject(name, namespace, size, storageClass string) *core.PersistentVolumeClaim {
 	return &core.PersistentVolumeClaim{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,

diff --git a/e2e/test/framework/statefulset.go b/e2e/test/framework/statefulset.go
@@ -7,7 +7,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func (f *Invocation) GetStatefulSetObject(name, namespace, storageClass string) *appsv1.StatefulSet {
+func GetStatefulSetObject(name, namespace, storageClass string) *appsv1.StatefulSet {
 	return &appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,