Skip to content

Commit 768df1e

Browse files
alexandearalexandear
authored
Fix typos in unexported variable names (#1990)
1 parent ebecc56 commit 768df1e

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎cmd/importer/pod/check_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ func TestCheckNamespace(t *testing.T) {
4343
baseClusterQueue := utiltesting.MakeClusterQueue("cq1")
4444

4545
cases := map[string]struct {
46-
pods []corev1.Pod
47-
clusteQueues []kueue.ClusterQueue
48-
localQueues []kueue.LocalQueue
49-
mapping util.MappingRules
50-
flavors []kueue.ResourceFlavor
46+
pods []corev1.Pod
47+
clusterQueues []kueue.ClusterQueue
48+
localQueues []kueue.LocalQueue
49+
mapping util.MappingRules
50+
flavors []kueue.ResourceFlavor
5151

5252
wantError error
5353
}{
@@ -113,7 +113,7 @@ func TestCheckNamespace(t *testing.T) {
113113
localQueues: []kueue.LocalQueue{
114114
*baseLocalQueue.Obj(),
115115
},
116-
clusteQueues: []kueue.ClusterQueue{
116+
clusterQueues: []kueue.ClusterQueue{
117117
*baseClusterQueue.Obj(),
118118
},
119119
wantError: util.ErrCQInvalid,
@@ -136,7 +136,7 @@ func TestCheckNamespace(t *testing.T) {
136136
localQueues: []kueue.LocalQueue{
137137
*baseLocalQueue.Obj(),
138138
},
139-
clusteQueues: []kueue.ClusterQueue{
139+
clusterQueues: []kueue.ClusterQueue{
140140
*utiltesting.MakeClusterQueue("cq1").ResourceGroup(*utiltesting.MakeFlavorQuotas("rf1").Resource(corev1.ResourceCPU, "1").Obj()).Obj(),
141141
},
142142
flavors: []kueue.ResourceFlavor{
@@ -148,7 +148,7 @@ func TestCheckNamespace(t *testing.T) {
148148
for name, tc := range cases {
149149
t.Run(name, func(t *testing.T) {
150150
podsList := corev1.PodList{Items: tc.pods}
151-
cqList := kueue.ClusterQueueList{Items: tc.clusteQueues}
151+
cqList := kueue.ClusterQueueList{Items: tc.clusterQueues}
152152
lqList := kueue.LocalQueueList{Items: tc.localQueues}
153153
rfList := kueue.ResourceFlavorList{Items: tc.flavors}
154154

‎cmd/importer/pod/import_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ func TestImportNamespace(t *testing.T) {
8383
}
8484

8585
cases := map[string]struct {
86-
pods []corev1.Pod
87-
clusteQueues []kueue.ClusterQueue
88-
localQueues []kueue.LocalQueue
89-
mapping util.MappingRules
90-
addLabels map[string]string
86+
pods []corev1.Pod
87+
clusterQueues []kueue.ClusterQueue
88+
localQueues []kueue.LocalQueue
89+
mapping util.MappingRules
90+
addLabels map[string]string
9191

9292
wantPods []corev1.Pod
9393
wantWorkloads []kueue.Workload
@@ -112,7 +112,7 @@ func TestImportNamespace(t *testing.T) {
112112
localQueues: []kueue.LocalQueue{
113113
*baseLocalQueue.Obj(),
114114
},
115-
clusteQueues: []kueue.ClusterQueue{
115+
clusterQueues: []kueue.ClusterQueue{
116116
*baseClusterQueue.Obj(),
117117
},
118118

@@ -145,7 +145,7 @@ func TestImportNamespace(t *testing.T) {
145145
localQueues: []kueue.LocalQueue{
146146
*baseLocalQueue.Obj(),
147147
},
148-
clusteQueues: []kueue.ClusterQueue{
148+
clusterQueues: []kueue.ClusterQueue{
149149
*baseClusterQueue.Obj(),
150150
},
151151
addLabels: map[string]string{
@@ -171,7 +171,7 @@ func TestImportNamespace(t *testing.T) {
171171
for name, tc := range cases {
172172
t.Run(name, func(t *testing.T) {
173173
podsList := corev1.PodList{Items: tc.pods}
174-
cqList := kueue.ClusterQueueList{Items: tc.clusteQueues}
174+
cqList := kueue.ClusterQueueList{Items: tc.clusterQueues}
175175
lqList := kueue.LocalQueueList{Items: tc.localQueues}
176176

177177
builder := utiltesting.NewClientBuilder().

‎pkg/controller/admissionchecks/multikueue/controllers.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
)
2424

2525
const (
26-
defaultGCInterval = time.Minute
27-
defaultOrigin = "multikueue"
28-
defaulWorkerLostTimeout = 5 * time.Minute
26+
defaultGCInterval = time.Minute
27+
defaultOrigin = "multikueue"
28+
defaultWorkerLostTimeout = 5 * time.Minute
2929
)
3030

3131
type SetupOptions struct {
@@ -64,7 +64,7 @@ func SetupControllers(mgr ctrl.Manager, namespace string, opts ...SetupOption) e
6464
options := &SetupOptions{
6565
gcInterval: defaultGCInterval,
6666
origin: defaultOrigin,
67-
workerLostTimeout: defaulWorkerLostTimeout,
67+
workerLostTimeout: defaultWorkerLostTimeout,
6868
}
6969

7070
for _, o := range opts {

‎pkg/controller/admissionchecks/multikueue/jobset_adapter_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ func TestWlReconcileJobset(t *testing.T) {
323323
cRec.remoteClients["worker1"] = w1remoteClient
324324

325325
helper, _ := newMultiKueueStoreHelper(managerClient)
326-
reconciler := newWlReconciler(managerClient, helper, cRec, defaultOrigin, defaulWorkerLostTimeout)
326+
reconciler := newWlReconciler(managerClient, helper, cRec, defaultOrigin, defaultWorkerLostTimeout)
327327

328328
_, gotErr := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Name: "wl1", Namespace: TestNamespace}})
329329
if gotErr != nil {

‎pkg/controller/admissionchecks/multikueue/workload.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ func (a *wlReconciler) Reconcile(ctx context.Context, req reconcile.Request) (re
186186
return reconcile.Result{}, a.updateACS(ctx, wl, mkAc, kueue.CheckStateRejected, rejectionMessage)
187187
}
188188

189-
managed, unamagedReason, err := adapter.IsJobManagedByKueue(ctx, a.client, types.NamespacedName{Name: owner.Name, Namespace: wl.Namespace})
189+
managed, unmanagedReason, err := adapter.IsJobManagedByKueue(ctx, a.client, types.NamespacedName{Name: owner.Name, Namespace: wl.Namespace})
190190
if err != nil {
191191
return reconcile.Result{}, err
192192
}
193193

194194
if !managed {
195-
return reconcile.Result{}, a.updateACS(ctx, wl, mkAc, kueue.CheckStateRejected, fmt.Sprintf("The owner is not managed by Kueue: %s", unamagedReason))
195+
return reconcile.Result{}, a.updateACS(ctx, wl, mkAc, kueue.CheckStateRejected, fmt.Sprintf("The owner is not managed by Kueue: %s", unmanagedReason))
196196
}
197197

198198
grp, err := a.readGroup(ctx, wl, mkAc.Name, adapter, owner.Name)

‎pkg/controller/admissionchecks/multikueue/workload_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ func TestWlReconcile(t *testing.T) {
467467
AdmissionCheck(kueue.AdmissionCheckState{
468468
Name: "ac1",
469469
State: kueue.CheckStateReady,
470-
LastTransitionTime: metav1.NewTime(time.Now().Add(-defaulWorkerLostTimeout / 2)), //50% of the timeout
470+
LastTransitionTime: metav1.NewTime(time.Now().Add(-defaultWorkerLostTimeout / 2)), //50% of the timeout
471471
Message: `The workload got reservation on "worker1"`,
472472
}).
473473
ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
@@ -493,7 +493,7 @@ func TestWlReconcile(t *testing.T) {
493493
AdmissionCheck(kueue.AdmissionCheckState{
494494
Name: "ac1",
495495
State: kueue.CheckStateReady,
496-
LastTransitionTime: metav1.NewTime(time.Now().Add(-defaulWorkerLostTimeout * 3 / 2)), // 150% of the timeout
496+
LastTransitionTime: metav1.NewTime(time.Now().Add(-defaultWorkerLostTimeout * 3 / 2)), // 150% of the timeout
497497
Message: `The workload got reservation on "worker1"`,
498498
}).
499499
ControllerReference(batchv1.SchemeGroupVersion.WithKind("Job"), "job1", "uid1").
@@ -708,7 +708,7 @@ func TestWlReconcile(t *testing.T) {
708708
}
709709

710710
helper, _ := newMultiKueueStoreHelper(managerClient)
711-
reconciler := newWlReconciler(managerClient, helper, cRec, defaultOrigin, defaulWorkerLostTimeout)
711+
reconciler := newWlReconciler(managerClient, helper, cRec, defaultOrigin, defaultWorkerLostTimeout)
712712

713713
_, gotErr := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: types.NamespacedName{Name: tc.reconcileFor, Namespace: TestNamespace}})
714714
if diff := cmp.Diff(tc.wantError, gotErr, cmpopts.EquateErrors()); diff != "" {

‎pkg/podset/podset_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ func TestMergeRestore(t *testing.T) {
294294
}
295295

296296
restoreInfo := FromPodSet(orig)
297-
gotRestoreChage := RestorePodSpec(&tc.podSet.Template.ObjectMeta, &tc.podSet.Template.Spec, restoreInfo)
298-
if gotRestoreChage != tc.wantRestoreChanges {
297+
gotRestoreChange := RestorePodSpec(&tc.podSet.Template.ObjectMeta, &tc.podSet.Template.Spec, restoreInfo)
298+
if gotRestoreChange != tc.wantRestoreChanges {
299299
t.Errorf("Unexpected restore change status want:%v", tc.wantRestoreChanges)
300300
}
301301
if diff := cmp.Diff(orig.Template, tc.podSet.Template, cmpopts.EquateEmpty()); diff != "" {

0 commit comments

Comments
 (0)