Skip to content

Commit 526076e

Browse files
gjenkins8gjenkins8
committed
[dev-v3] Replace deprecated NewSimpleClientset
Signed-off-by: George Jenkins <gvjenkins@gmail.com>
1 parent fed524c commit 526076e

3 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎pkg/action/action_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ func TestConfiguration_Init(t *testing.T) {
352352
}
353353

354354
func TestGetVersionSet(t *testing.T) {
355-
client := fakeclientset.NewSimpleClientset()
355+
client := fakeclientset.NewClientset()
356356

357357
vs, err := GetVersionSet(client.Discovery())
358358
if err != nil {

‎pkg/kube/client_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ func TestGetPodList(t *testing.T) {
712712
responsePodList.Items = append(responsePodList.Items, newPodWithStatus(name, v1.PodStatus{}, namespace))
713713
}
714714

715-
kubeClient := k8sfake.NewSimpleClientset(&responsePodList)
715+
kubeClient := k8sfake.NewClientset(&responsePodList)
716716
c := Client{Namespace: namespace, kubeClient: kubeClient}
717717

718718
podList, err := c.GetPodList(namespace, metav1.ListOptions{})
@@ -726,7 +726,7 @@ func TestOutputContainerLogsForPodList(t *testing.T) {
726726
namespace := "some-namespace"
727727
somePodList := newPodList("jimmy", "three", "structs")
728728

729-
kubeClient := k8sfake.NewSimpleClientset(&somePodList)
729+
kubeClient := k8sfake.NewClientset(&somePodList)
730730
c := Client{Namespace: namespace, kubeClient: kubeClient}
731731
outBuffer := &bytes.Buffer{}
732732
outBufferFunc := func(_, _, _ string) io.Writer { return outBuffer }

‎pkg/kube/ready_test.go‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) {
5858
{
5959
name: "IsReady Pod",
6060
fields: fields{
61-
client: fake.NewSimpleClientset(),
61+
client: fake.NewClientset(),
6262
log: func(string, ...interface{}) {},
6363
checkJobs: true,
6464
pausedAsReady: false,
@@ -74,7 +74,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) {
7474
{
7575
name: "IsReady Pod returns error",
7676
fields: fields{
77-
client: fake.NewSimpleClientset(),
77+
client: fake.NewClientset(),
7878
log: func(string, ...interface{}) {},
7979
checkJobs: true,
8080
pausedAsReady: false,
@@ -134,7 +134,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) {
134134
{
135135
name: "IsReady Job error while getting job",
136136
fields: fields{
137-
client: fake.NewSimpleClientset(),
137+
client: fake.NewClientset(),
138138
log: func(string, ...interface{}) {},
139139
checkJobs: true,
140140
pausedAsReady: false,
@@ -150,7 +150,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) {
150150
{
151151
name: "IsReady Job",
152152
fields: fields{
153-
client: fake.NewSimpleClientset(),
153+
client: fake.NewClientset(),
154154
log: func(string, ...interface{}) {},
155155
checkJobs: true,
156156
pausedAsReady: false,
@@ -210,7 +210,7 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) {
210210
{
211211
name: "IsReady Deployments error while getting current Deployment",
212212
fields: fields{
213-
client: fake.NewSimpleClientset(),
213+
client: fake.NewClientset(),
214214
log: func(string, ...interface{}) {},
215215
checkJobs: true,
216216
pausedAsReady: false,
@@ -227,7 +227,7 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) {
227227
{
228228
name: "IsReady Deployments", //TODO fix this one
229229
fields: fields{
230-
client: fake.NewSimpleClientset(),
230+
client: fake.NewClientset(),
231231
log: func(string, ...interface{}) {},
232232
checkJobs: true,
233233
pausedAsReady: false,
@@ -291,7 +291,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) {
291291
{
292292
name: "IsReady PersistentVolumeClaim",
293293
fields: fields{
294-
client: fake.NewSimpleClientset(),
294+
client: fake.NewClientset(),
295295
log: func(string, ...interface{}) {},
296296
checkJobs: true,
297297
pausedAsReady: false,
@@ -307,7 +307,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) {
307307
{
308308
name: "IsReady PersistentVolumeClaim with error",
309309
fields: fields{
310-
client: fake.NewSimpleClientset(),
310+
client: fake.NewClientset(),
311311
log: func(string, ...interface{}) {},
312312
checkJobs: true,
313313
pausedAsReady: false,
@@ -366,7 +366,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) {
366366
{
367367
name: "IsReady Service",
368368
fields: fields{
369-
client: fake.NewSimpleClientset(),
369+
client: fake.NewClientset(),
370370
log: func(string, ...interface{}) {},
371371
checkJobs: true,
372372
pausedAsReady: false,
@@ -382,7 +382,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) {
382382
{
383383
name: "IsReady Service with error",
384384
fields: fields{
385-
client: fake.NewSimpleClientset(),
385+
client: fake.NewClientset(),
386386
log: func(string, ...interface{}) {},
387387
checkJobs: true,
388388
pausedAsReady: false,
@@ -441,7 +441,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) {
441441
{
442442
name: "IsReady DaemonSet",
443443
fields: fields{
444-
client: fake.NewSimpleClientset(),
444+
client: fake.NewClientset(),
445445
log: func(string, ...interface{}) {},
446446
checkJobs: true,
447447
pausedAsReady: false,
@@ -457,7 +457,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) {
457457
{
458458
name: "IsReady DaemonSet with error",
459459
fields: fields{
460-
client: fake.NewSimpleClientset(),
460+
client: fake.NewClientset(),
461461
log: func(string, ...interface{}) {},
462462
checkJobs: true,
463463
pausedAsReady: false,
@@ -516,7 +516,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) {
516516
{
517517
name: "IsReady StatefulSet",
518518
fields: fields{
519-
client: fake.NewSimpleClientset(),
519+
client: fake.NewClientset(),
520520
log: func(string, ...interface{}) {},
521521
checkJobs: true,
522522
pausedAsReady: false,
@@ -532,7 +532,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) {
532532
{
533533
name: "IsReady StatefulSet with error",
534534
fields: fields{
535-
client: fake.NewSimpleClientset(),
535+
client: fake.NewClientset(),
536536
log: func(string, ...interface{}) {},
537537
checkJobs: true,
538538
pausedAsReady: false,
@@ -591,7 +591,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) {
591591
{
592592
name: "IsReady ReplicationController",
593593
fields: fields{
594-
client: fake.NewSimpleClientset(),
594+
client: fake.NewClientset(),
595595
log: func(string, ...interface{}) {},
596596
checkJobs: true,
597597
pausedAsReady: false,
@@ -607,7 +607,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) {
607607
{
608608
name: "IsReady ReplicationController with error",
609609
fields: fields{
610-
client: fake.NewSimpleClientset(),
610+
client: fake.NewClientset(),
611611
log: func(string, ...interface{}) {},
612612
checkJobs: true,
613613
pausedAsReady: false,
@@ -623,7 +623,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) {
623623
{
624624
name: "IsReady ReplicationController and pods not ready for object",
625625
fields: fields{
626-
client: fake.NewSimpleClientset(),
626+
client: fake.NewClientset(),
627627
log: func(string, ...interface{}) {},
628628
checkJobs: true,
629629
pausedAsReady: false,
@@ -682,7 +682,7 @@ func Test_ReadyChecker_IsReady_ReplicaSet(t *testing.T) {
682682
{
683683
name: "IsReady ReplicaSet",
684684
fields: fields{
685-
client: fake.NewSimpleClientset(),
685+
client: fake.NewClientset(),
686686
log: func(string, ...interface{}) {},
687687
checkJobs: true,
688688
pausedAsReady: false,
@@ -698,7 +698,7 @@ func Test_ReadyChecker_IsReady_ReplicaSet(t *testing.T) {
698698
{
699699
name: "IsReady ReplicaSet not ready",
700700
fields: fields{
701-
client: fake.NewSimpleClientset(),
701+
client: fake.NewClientset(),
702702
log: func(string, ...interface{}) {},
703703
checkJobs: true,
704704
pausedAsReady: false,
@@ -793,7 +793,7 @@ func Test_ReadyChecker_deploymentReady(t *testing.T) {
793793
}
794794
for _, tt := range tests {
795795
t.Run(tt.name, func(t *testing.T) {
796-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
796+
c := NewReadyChecker(fake.NewClientset(), nil)
797797
if got := c.deploymentReady(tt.args.rs, tt.args.dep); got != tt.want {
798798
t.Errorf("deploymentReady() = %v, want %v", got, tt.want)
799799
}
@@ -827,7 +827,7 @@ func Test_ReadyChecker_replicaSetReady(t *testing.T) {
827827
}
828828
for _, tt := range tests {
829829
t.Run(tt.name, func(t *testing.T) {
830-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
830+
c := NewReadyChecker(fake.NewClientset(), nil)
831831
if got := c.replicaSetReady(tt.args.rs); got != tt.want {
832832
t.Errorf("replicaSetReady() = %v, want %v", got, tt.want)
833833
}
@@ -861,7 +861,7 @@ func Test_ReadyChecker_replicationControllerReady(t *testing.T) {
861861
}
862862
for _, tt := range tests {
863863
t.Run(tt.name, func(t *testing.T) {
864-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
864+
c := NewReadyChecker(fake.NewClientset(), nil)
865865
if got := c.replicationControllerReady(tt.args.rc); got != tt.want {
866866
t.Errorf("replicationControllerReady() = %v, want %v", got, tt.want)
867867
}
@@ -916,7 +916,7 @@ func Test_ReadyChecker_daemonSetReady(t *testing.T) {
916916
}
917917
for _, tt := range tests {
918918
t.Run(tt.name, func(t *testing.T) {
919-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
919+
c := NewReadyChecker(fake.NewClientset(), nil)
920920
if got := c.daemonSetReady(tt.args.ds); got != tt.want {
921921
t.Errorf("daemonSetReady() = %v, want %v", got, tt.want)
922922
}
@@ -992,7 +992,7 @@ func Test_ReadyChecker_statefulSetReady(t *testing.T) {
992992
}
993993
for _, tt := range tests {
994994
t.Run(tt.name, func(t *testing.T) {
995-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
995+
c := NewReadyChecker(fake.NewClientset(), nil)
996996
if got := c.statefulSetReady(tt.args.sts); got != tt.want {
997997
t.Errorf("statefulSetReady() = %v, want %v", got, tt.want)
998998
}
@@ -1051,7 +1051,7 @@ func Test_ReadyChecker_podsReadyForObject(t *testing.T) {
10511051
}
10521052
for _, tt := range tests {
10531053
t.Run(tt.name, func(t *testing.T) {
1054-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
1054+
c := NewReadyChecker(fake.NewClientset(), nil)
10551055
for _, pod := range tt.existPods {
10561056
if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(context.TODO(), &pod, metav1.CreateOptions{}); err != nil {
10571057
t.Errorf("Failed to create Pod error: %v", err)
@@ -1130,7 +1130,7 @@ func Test_ReadyChecker_jobReady(t *testing.T) {
11301130
}
11311131
for _, tt := range tests {
11321132
t.Run(tt.name, func(t *testing.T) {
1133-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
1133+
c := NewReadyChecker(fake.NewClientset(), nil)
11341134
got, err := c.jobReady(tt.args.job)
11351135
if (err != nil) != tt.wantErr {
11361136
t.Errorf("jobReady() error = %v, wantErr %v", err, tt.wantErr)
@@ -1169,7 +1169,7 @@ func Test_ReadyChecker_volumeReady(t *testing.T) {
11691169
}
11701170
for _, tt := range tests {
11711171
t.Run(tt.name, func(t *testing.T) {
1172-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
1172+
c := NewReadyChecker(fake.NewClientset(), nil)
11731173
if got := c.volumeReady(tt.args.v); got != tt.want {
11741174
t.Errorf("volumeReady() = %v, want %v", got, tt.want)
11751175
}
@@ -1214,7 +1214,7 @@ func Test_ReadyChecker_serviceReady(t *testing.T) {
12141214
}
12151215
for _, tt := range tests {
12161216
t.Run(tt.name, func(t *testing.T) {
1217-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
1217+
c := NewReadyChecker(fake.NewClientset(), nil)
12181218
got := c.serviceReady(tt.args.service)
12191219
if got != tt.want {
12201220
t.Errorf("serviceReady() = %v, want %v", got, tt.want)
@@ -1283,7 +1283,7 @@ func Test_ReadyChecker_crdBetaReady(t *testing.T) {
12831283
}
12841284
for _, tt := range tests {
12851285
t.Run(tt.name, func(t *testing.T) {
1286-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
1286+
c := NewReadyChecker(fake.NewClientset(), nil)
12871287
got := c.crdBetaReady(tt.args.crdBeta)
12881288
if got != tt.want {
12891289
t.Errorf("crdBetaReady() = %v, want %v", got, tt.want)
@@ -1352,7 +1352,7 @@ func Test_ReadyChecker_crdReady(t *testing.T) {
13521352
}
13531353
for _, tt := range tests {
13541354
t.Run(tt.name, func(t *testing.T) {
1355-
c := NewReadyChecker(fake.NewSimpleClientset(), nil)
1355+
c := NewReadyChecker(fake.NewClientset(), nil)
13561356
got := c.crdReady(tt.args.crdBeta)
13571357
if got != tt.want {
13581358
t.Errorf("crdBetaReady() = %v, want %v", got, tt.want)

0 commit comments

Comments
 (0)