diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go
index b1cf20597..ec6e261db 100644
--- a/pkg/action/action_test.go
+++ b/pkg/action/action_test.go
@@ -347,7 +347,7 @@ func TestConfiguration_Init(t *testing.T) {
 }
 
 func TestGetVersionSet(t *testing.T) {
-	client := fakeclientset.NewSimpleClientset()
+	client := fakeclientset.NewClientset()
 
 	vs, err := GetVersionSet(client.Discovery())
 	if err != nil {
diff --git a/pkg/kube/ready_test.go b/pkg/kube/ready_test.go
index a8ba05287..879fa4c76 100644
--- a/pkg/kube/ready_test.go
+++ b/pkg/kube/ready_test.go
@@ -56,7 +56,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) {
 		{
 			name: "IsReady Pod",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -72,7 +72,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) {
 		{
 			name: "IsReady Pod returns error",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -132,7 +132,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) {
 		{
 			name: "IsReady Job error while getting job",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -148,7 +148,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) {
 		{
 			name: "IsReady Job",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -208,7 +208,7 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) {
 		{
 			name: "IsReady Deployments error while getting current Deployment",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -225,7 +225,7 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) {
 		{
 			name: "IsReady Deployments", //TODO fix this one
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -289,7 +289,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) {
 		{
 			name: "IsReady PersistentVolumeClaim",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -305,7 +305,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) {
 		{
 			name: "IsReady PersistentVolumeClaim with error",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -364,7 +364,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) {
 		{
 			name: "IsReady Service",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -380,7 +380,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) {
 		{
 			name: "IsReady Service with error",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -439,7 +439,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) {
 		{
 			name: "IsReady DaemonSet",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -455,7 +455,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) {
 		{
 			name: "IsReady DaemonSet with error",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -514,7 +514,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) {
 		{
 			name: "IsReady StatefulSet",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -530,7 +530,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) {
 		{
 			name: "IsReady StatefulSet with error",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -589,7 +589,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) {
 		{
 			name: "IsReady ReplicationController",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -605,7 +605,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) {
 		{
 			name: "IsReady ReplicationController with error",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -621,7 +621,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) {
 		{
 			name: "IsReady ReplicationController and pods not ready for object",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -680,7 +680,7 @@ func Test_ReadyChecker_IsReady_ReplicaSet(t *testing.T) {
 		{
 			name: "IsReady ReplicaSet",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -696,7 +696,7 @@ func Test_ReadyChecker_IsReady_ReplicaSet(t *testing.T) {
 		{
 			name: "IsReady ReplicaSet not ready",
 			fields: fields{
-				client:        fake.NewSimpleClientset(),
+				client:        fake.NewClientset(),
 				log:           func(string, ...interface{}) {},
 				checkJobs:     true,
 				pausedAsReady: false,
@@ -791,7 +791,7 @@ func Test_ReadyChecker_deploymentReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			if got := c.deploymentReady(tt.args.rs, tt.args.dep); got != tt.want {
 				t.Errorf("deploymentReady() = %v, want %v", got, tt.want)
 			}
@@ -825,7 +825,7 @@ func Test_ReadyChecker_replicaSetReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			if got := c.replicaSetReady(tt.args.rs); got != tt.want {
 				t.Errorf("replicaSetReady() = %v, want %v", got, tt.want)
 			}
@@ -859,7 +859,7 @@ func Test_ReadyChecker_replicationControllerReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			if got := c.replicationControllerReady(tt.args.rc); got != tt.want {
 				t.Errorf("replicationControllerReady() = %v, want %v", got, tt.want)
 			}
@@ -914,7 +914,7 @@ func Test_ReadyChecker_daemonSetReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			if got := c.daemonSetReady(tt.args.ds); got != tt.want {
 				t.Errorf("daemonSetReady() = %v, want %v", got, tt.want)
 			}
@@ -990,7 +990,7 @@ func Test_ReadyChecker_statefulSetReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			if got := c.statefulSetReady(tt.args.sts); got != tt.want {
 				t.Errorf("statefulSetReady() = %v, want %v", got, tt.want)
 			}
@@ -1049,7 +1049,7 @@ func Test_ReadyChecker_podsReadyForObject(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			for _, pod := range tt.existPods {
 				if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(context.TODO(), &pod, metav1.CreateOptions{}); err != nil {
 					t.Errorf("Failed to create Pod error: %v", err)
@@ -1128,7 +1128,7 @@ func Test_ReadyChecker_jobReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			got, err := c.jobReady(tt.args.job)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("jobReady() error = %v, wantErr %v", err, tt.wantErr)
@@ -1167,7 +1167,7 @@ func Test_ReadyChecker_volumeReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			if got := c.volumeReady(tt.args.v); got != tt.want {
 				t.Errorf("volumeReady() = %v, want %v", got, tt.want)
 			}
@@ -1212,7 +1212,7 @@ func Test_ReadyChecker_serviceReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			got := c.serviceReady(tt.args.service)
 			if got != tt.want {
 				t.Errorf("serviceReady() = %v, want %v", got, tt.want)
@@ -1281,7 +1281,7 @@ func Test_ReadyChecker_crdBetaReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			got := c.crdBetaReady(tt.args.crdBeta)
 			if got != tt.want {
 				t.Errorf("crdBetaReady() = %v, want %v", got, tt.want)
@@ -1350,7 +1350,7 @@ func Test_ReadyChecker_crdReady(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			c := NewReadyChecker(fake.NewSimpleClientset(), nil)
+			c := NewReadyChecker(fake.NewClientset(), nil)
 			got := c.crdReady(tt.args.crdBeta)
 			if got != tt.want {
 				t.Errorf("crdBetaReady() = %v, want %v", got, tt.want)