Skip to content

Commit 89dee79

Browse files
committed
fix lint
Signed-off-by: AiRanthem <zhongtianyun.zty@alibaba-inc.com>
1 parent 78e1dda commit 89dee79

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

pkg/controller/workloadspread/workloadspread_controller.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@ func (r *ReconcileWorkloadSpread) getReplicasPathList(ws *appsv1alpha1.WorkloadS
289289
return nil, err
290290
}
291291
gv, err := schema.ParseGroupVersion(ws.Spec.TargetReference.APIVersion)
292+
if err != nil {
293+
return nil, err
294+
}
292295
for _, wl := range whiteList.Workloads {
293296
if wl.GroupVersion() != gv || wl.GroupVersionKind.Kind != ws.Spec.TargetReference.Kind {
294297
continue
@@ -313,6 +316,9 @@ func (r *ReconcileWorkloadSpread) getPodsForWorkloadSpread(ws *appsv1alpha1.Work
313316
pods, workloadReplicas, err = r.getPodJob(targetRef, ws.Namespace)
314317
default:
315318
pods, workloadReplicas, err = r.controllerFinder.GetPodsForRef(targetRef.APIVersion, targetRef.Kind, ws.Namespace, targetRef.Name, false)
319+
if err != nil {
320+
break
321+
}
316322
workloadReplicas, pods, err = r.filterWorkload(ws, pods, workloadReplicas)
317323
}
318324

pkg/util/workloadspread/workloadspread.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,6 @@ func GenerateEmptyWorkloadObject(gvk schema.GroupVersionKind, key types.Namespac
885885
return
886886
}
887887

888-
// GetReplicasFromObject tries to get replicas from object by given path (default path is "spec.replcias")
889888
func GetReplicasFromObject(object *unstructured.Unstructured, replicasPath string) (int32, error) {
890889
if replicasPath == "" {
891890
return 0, nil

0 commit comments

Comments
 (0)