Skip to content

Commit 520e972

Browse files
polyaxon-cipolyaxon-ci
committed
More linting fixes
1 parent 102a4a6 commit 520e972

33 files changed

+162
-129
lines changed

‎api/v1/condition_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ var _ = Describe("OperationStatus Deletion Utility Functions", func() {
293293

294294
Expect(updated).To(BeTrue())
295295
Expect(status.IsFailed()).To(BeTrue())
296-
Expect(len(status.Conditions)).To(Equal(1))
296+
Expect(status.Conditions).To(HaveLen(1))
297297
})
298298
})
299299
})

‎api/v1/job_types_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ var _ = Describe("Job", func() {
7272
Expect(IsOperationBeingDeleted(op)).To(BeTrue())
7373

7474
controllerutil.AddFinalizer(op, OperationLogsFinalizer)
75-
Expect(len(op.GetFinalizers())).To(Equal(1))
75+
Expect(op.GetFinalizers()).To(HaveLen(1))
7676
Expect(controllerutil.ContainsFinalizer(op, OperationLogsFinalizer)).To(BeTrue())
7777
Expect(containsString(op.ObjectMeta.Finalizers, OperationLogsFinalizer)).To(BeTrue())
7878

7979
controllerutil.RemoveFinalizer(op, OperationLogsFinalizer)
80-
Expect(len(op.GetFinalizers())).To(Equal(0))
80+
Expect(op.GetFinalizers()).To(BeEmpty())
8181
Expect(controllerutil.ContainsFinalizer(op, OperationLogsFinalizer)).To(BeFalse())
8282
})
8383

@@ -92,12 +92,12 @@ var _ = Describe("Job", func() {
9292
Expect(IsOperationBeingDeleted(op)).To(BeTrue())
9393

9494
controllerutil.AddFinalizer(op, OperationStatusFinalizer)
95-
Expect(len(op.GetFinalizers())).To(Equal(1))
95+
Expect(op.GetFinalizers()).To(HaveLen(1))
9696
Expect(controllerutil.ContainsFinalizer(op, OperationStatusFinalizer)).To(BeTrue())
9797
Expect(containsString(op.ObjectMeta.Finalizers, OperationStatusFinalizer)).To(BeTrue())
9898

9999
controllerutil.RemoveFinalizer(op, OperationStatusFinalizer)
100-
Expect(len(op.GetFinalizers())).To(Equal(0))
100+
Expect(op.GetFinalizers()).To(BeEmpty())
101101
Expect(controllerutil.ContainsFinalizer(op, OperationStatusFinalizer)).To(BeFalse())
102102
})
103103

@@ -113,13 +113,13 @@ var _ = Describe("Job", func() {
113113

114114
controllerutil.AddFinalizer(op, OperationLogsFinalizer)
115115
controllerutil.AddFinalizer(op, OperationStatusFinalizer)
116-
Expect(len(op.GetFinalizers())).To(Equal(2))
116+
Expect(op.GetFinalizers()).To(HaveLen(2))
117117
Expect(controllerutil.ContainsFinalizer(op, OperationStatusFinalizer)).To(BeTrue())
118118
Expect(controllerutil.ContainsFinalizer(op, OperationLogsFinalizer)).To(BeTrue())
119119

120120
controllerutil.RemoveFinalizer(op, OperationStatusFinalizer)
121121
controllerutil.RemoveFinalizer(op, OperationLogsFinalizer)
122-
Expect(len(op.GetFinalizers())).To(Equal(0))
122+
Expect(op.GetFinalizers()).To(BeEmpty())
123123
Expect(controllerutil.ContainsFinalizer(op, OperationStatusFinalizer)).To(BeFalse())
124124
Expect(controllerutil.ContainsFinalizer(op, OperationLogsFinalizer)).To(BeFalse())
125125
})

‎cmd/main.go‎

Lines changed: 80 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ func init() {
5959
}
6060

6161
// registerUnstructuredIndex registers a field index for unstructured resources
62-
func registerUnstructuredIndex(mgr ctrl.Manager, gvk schema.GroupVersionKind, indexField string, ownerKind string) error {
62+
func registerUnstructuredIndex(
63+
mgr ctrl.Manager, gvk schema.GroupVersionKind, indexField string, ownerKind string,
64+
) error {
6365
u := &unstructured.Unstructured{}
6466
u.SetGroupVersionKind(gvk)
6567

@@ -243,66 +245,81 @@ func main() {
243245
podUIDIndexField := "metadata.uid"
244246

245247
// Index Event by `involvedObject.uid`
246-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &corev1.Event{}, indexEventInvolvedObjectUidField, func(rawObj client.Object) []string {
247-
event := rawObj.(*corev1.Event)
248-
if event.InvolvedObject.UID == "" {
249-
return nil
250-
}
251-
return []string{string(event.InvolvedObject.UID)}
252-
}); err != nil {
248+
err = mgr.GetFieldIndexer().IndexField(
249+
context.Background(), &corev1.Event{}, indexEventInvolvedObjectUidField,
250+
func(rawObj client.Object) []string {
251+
event := rawObj.(*corev1.Event)
252+
if event.InvolvedObject.UID == "" {
253+
return nil
254+
}
255+
return []string{string(event.InvolvedObject.UID)}
256+
})
257+
if err != nil {
253258
setupLog.Error(err, "unable to create index for Event")
254259
os.Exit(1)
255260
}
256261

257-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &corev1.Pod{}, podUIDIndexField, func(rawObj client.Object) []string {
258-
pod := rawObj.(*corev1.Pod)
259-
return []string{string(pod.UID)}
260-
}); err != nil {
262+
err = mgr.GetFieldIndexer().IndexField(
263+
context.Background(), &corev1.Pod{}, podUIDIndexField,
264+
func(rawObj client.Object) []string {
265+
pod := rawObj.(*corev1.Pod)
266+
return []string{string(pod.UID)}
267+
})
268+
if err != nil {
261269
setupLog.Error(err, "unable to create index for Pod")
262270
os.Exit(1)
263271
}
264272

265-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &batchv1.Job{}, indexOwnerField, func(rawObj client.Object) []string {
266-
job := rawObj.(*batchv1.Job)
267-
owner := metav1.GetControllerOf(job)
268-
if owner == nil {
269-
return nil
270-
}
271-
if owner.APIVersion != apiv1.GroupVersion.String() || owner.Kind != "job" {
272-
return nil
273-
}
274-
return []string{owner.Name}
275-
}); err != nil {
273+
err = mgr.GetFieldIndexer().IndexField(
274+
context.Background(), &batchv1.Job{}, indexOwnerField,
275+
func(rawObj client.Object) []string {
276+
job := rawObj.(*batchv1.Job)
277+
owner := metav1.GetControllerOf(job)
278+
if owner == nil {
279+
return nil
280+
}
281+
if owner.APIVersion != apiv1.GroupVersion.String() || owner.Kind != "job" {
282+
return nil
283+
}
284+
return []string{owner.Name}
285+
})
286+
if err != nil {
276287
setupLog.Error(err, "unable to create index for Job")
277288
os.Exit(1)
278289
}
279290

280-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &appsv1.Deployment{}, indexOwnerField, func(rawObj client.Object) []string {
281-
deployment := rawObj.(*appsv1.Deployment)
282-
owner := metav1.GetControllerOf(deployment)
283-
if owner == nil {
284-
return nil
285-
}
286-
if owner.APIVersion != apiv1.GroupVersion.String() || owner.Kind != "service" {
287-
return nil
288-
}
289-
return []string{owner.Name}
290-
}); err != nil {
291+
err = mgr.GetFieldIndexer().IndexField(
292+
context.Background(), &appsv1.Deployment{}, indexOwnerField,
293+
func(rawObj client.Object) []string {
294+
deployment := rawObj.(*appsv1.Deployment)
295+
owner := metav1.GetControllerOf(deployment)
296+
if owner == nil {
297+
return nil
298+
}
299+
if owner.APIVersion != apiv1.GroupVersion.String() || owner.Kind != "service" {
300+
return nil
301+
}
302+
return []string{owner.Name}
303+
})
304+
if err != nil {
291305
setupLog.Error(err, "unable to create index for Deployment")
292306
os.Exit(1)
293307
}
294308

295-
if err := mgr.GetFieldIndexer().IndexField(context.Background(), &corev1.Service{}, indexOwnerField, func(rawObj client.Object) []string {
296-
service := rawObj.(*corev1.Service)
297-
owner := metav1.GetControllerOf(service)
298-
if owner == nil {
299-
return nil
300-
}
301-
if owner.APIVersion != apiv1.GroupVersion.String() || owner.Kind != "service" {
302-
return nil
303-
}
304-
return []string{owner.Name}
305-
}); err != nil {
309+
err = mgr.GetFieldIndexer().IndexField(
310+
context.Background(), &corev1.Service{}, indexOwnerField,
311+
func(rawObj client.Object) []string {
312+
service := rawObj.(*corev1.Service)
313+
owner := metav1.GetControllerOf(service)
314+
if owner == nil {
315+
return nil
316+
}
317+
if owner.APIVersion != apiv1.GroupVersion.String() || owner.Kind != "service" {
318+
return nil
319+
}
320+
return []string{owner.Name}
321+
})
322+
if err != nil {
306323
setupLog.Error(err, "unable to create index for Service")
307324
os.Exit(1)
308325
}
@@ -311,13 +328,19 @@ func main() {
311328
kubeflowJobTypes := []schema.GroupVersionKind{}
312329

313330
if config.GetBoolEnv(config.TFJobEnabled, false) {
314-
kubeflowJobTypes = append(kubeflowJobTypes, schema.GroupVersionKind{Group: "kubeflow.org", Version: "v1", Kind: "TFJob"})
331+
kubeflowJobTypes = append(kubeflowJobTypes, schema.GroupVersionKind{
332+
Group: "kubeflow.org", Version: "v1", Kind: "TFJob",
333+
})
315334
}
316335
if config.GetBoolEnv(config.PytorchJobEnabled, false) {
317-
kubeflowJobTypes = append(kubeflowJobTypes, schema.GroupVersionKind{Group: "kubeflow.org", Version: "v1", Kind: "PyTorchJob"})
336+
kubeflowJobTypes = append(kubeflowJobTypes, schema.GroupVersionKind{
337+
Group: "kubeflow.org", Version: "v1", Kind: "PyTorchJob",
338+
})
318339
}
319340
if config.GetBoolEnv(config.MPIJobEnabled, false) {
320-
kubeflowJobTypes = append(kubeflowJobTypes, schema.GroupVersionKind{Group: "kubeflow.org", Version: "v1", Kind: "MPIJob"})
341+
kubeflowJobTypes = append(kubeflowJobTypes, schema.GroupVersionKind{
342+
Group: "kubeflow.org", Version: "v1", Kind: "MPIJob",
343+
})
321344
}
322345

323346
for _, gvk := range kubeflowJobTypes {
@@ -331,15 +354,21 @@ func main() {
331354
clusterTypes := []schema.GroupVersionKind{}
332355

333356
if config.GetBoolEnv(config.RayClusterEnabled, false) {
334-
clusterTypes = append(clusterTypes, schema.GroupVersionKind{Group: "ray.io", Version: "v1", Kind: "RayCluster"})
357+
clusterTypes = append(clusterTypes, schema.GroupVersionKind{
358+
Group: "ray.io", Version: "v1", Kind: "RayCluster",
359+
})
335360
}
336361
if config.GetBoolEnv(config.DaskClusterEnabled, false) {
337-
clusterTypes = append(clusterTypes, schema.GroupVersionKind{Group: "kubernetes.dask.org", Version: "v1", Kind: "DaskCluster"})
362+
clusterTypes = append(clusterTypes, schema.GroupVersionKind{
363+
Group: "kubernetes.dask.org", Version: "v1", Kind: "DaskCluster",
364+
})
338365
}
339366
// Note: SparkApplication doesn't have a corresponding config flag yet
340367
// Uncomment when POLYAXON_SPARK_JOB_ENABLED is added to config
341368
// if config.GetBoolEnv(config.SparkJobEnabled, false) {
342-
// clusterTypes = append(clusterTypes, schema.GroupVersionKind{Group: "sparkoperator.k8s.io", Version: "v1beta2", Kind: "SparkApplication"})
369+
// clusterTypes = append(clusterTypes, schema.GroupVersionKind{
370+
// Group: "sparkoperator.k8s.io", Version: "v1beta2", Kind: "SparkApplication",
371+
// })
343372
// }
344373

345374
for _, gvk := range clusterTypes {

‎cmd/openapi-gen/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ func main() {
5858
}
5959

6060
func swaggify(name string) string {
61-
name = strings.Replace(name, "github.com/polyaxon/mloperator/api/", "", -1)
62-
name = strings.Replace(name, "k8s.io/api/core/", "", -1)
63-
name = strings.Replace(name, "k8s.io/apimachinery/pkg/apis/meta/", "", -1)
64-
name = strings.Replace(name, "/", ".", -1)
61+
name = strings.ReplaceAll(name, "github.com/polyaxon/mloperator/api/", "")
62+
name = strings.ReplaceAll(name, "k8s.io/api/core/", "")
63+
name = strings.ReplaceAll(name, "k8s.io/apimachinery/pkg/apis/meta/", "")
64+
name = strings.ReplaceAll(name, "/", ".")
6565
return name
6666
}

‎internal/controller/cluster/cleanup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (r *ClusterReconciler) handlePastActiveDeadline(ctx context.Context, instan
5858
return nil, nil
5959
}
6060
currentTime := metav1.Now()
61-
duration := currentTime.Time.Sub(startTime.Time)
61+
duration := currentTime.Sub(startTime.Time)
6262
allowedDuration := time.Second * time.Duration(*activeDeadlineSeconds)
6363
if duration >= allowedDuration {
6464
log.V(1).Info("Cleanup triggered based on ActiveDeadlineSeconds")

‎internal/controller/cluster/daskcluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func (r *ClusterReconciler) reconcileDaskClusterStatus(instance *apiv1.Cluster,
149149
log := r.Log
150150

151151
// Get pod status for enhanced error messages (but don't let it override cluster status)
152-
instanceID, ok := instance.ObjectMeta.Labels["app.kubernetes.io/instance"]
152+
instanceID, ok := instance.Labels["app.kubernetes.io/instance"]
153153
podStatus, reason, message := managers.HasUnschedulablePods(r.Client, instanceID, instance.Namespace)
154154

155155
status, ok, unerr := unstructured.NestedFieldCopy(cluster.Object, "status")

‎internal/controller/cluster/finalizer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (r *ClusterReconciler) handleFinalizers(ctx context.Context, instance *apiv
2626

2727
if !instance.Status.IsDone() {
2828
log.Info("Instance was probably stopped", "Append final status", "Stopping")
29-
r.syncStatus(
29+
_ = r.syncStatus(
3030
instance,
3131
apiv1.NewOperationCondition(
3232
apiv1.OperationStopped,

‎internal/controller/cluster/raycluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (r *ClusterReconciler) reconcileRayClusterStatus(instance *apiv1.Cluster, j
147147
log := r.Log
148148

149149
// Check the pods
150-
instanceID, ok := instance.ObjectMeta.Labels["app.kubernetes.io/instance"]
150+
instanceID, ok := instance.Labels["app.kubernetes.io/instance"]
151151
podStatus, reason, message := managers.HasUnschedulablePods(r.Client, instanceID, instance.Namespace)
152152
if podStatus == apiv1.OperationWarning {
153153
log.V(1).Info("Service has unschedulable pod(s)", "Reason", reason, "message", message)

‎internal/controller/cluster/sync.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ func (r *ClusterReconciler) instanceSyncStatus(instance *apiv1.Cluster) error {
1818
}
1919

2020
func (r *ClusterReconciler) getInstanceInfo(instance *apiv1.Cluster) (string, string, string, string, bool) {
21-
instanceID, ok := instance.ObjectMeta.Labels["app.kubernetes.io/instance"]
21+
instanceID, ok := instance.Labels["app.kubernetes.io/instance"]
2222
if !ok || instanceID == "" {
2323
return "", "", "", "", false
2424
}
2525

26-
instanceOwner, ok := instance.ObjectMeta.Annotations["operation.polyaxon.com/owner"]
26+
instanceOwner, ok := instance.Annotations["operation.polyaxon.com/owner"]
2727
if !ok || instanceOwner == "" {
2828
return "", "", "", "", false
2929
}
3030

31-
instanceProject, ok := instance.ObjectMeta.Annotations["operation.polyaxon.com/project"]
31+
instanceProject, ok := instance.Annotations["operation.polyaxon.com/project"]
3232
if !ok || instanceProject == "" {
3333
return "", "", "", "", false
3434
}
3535

36-
instanceKind, ok := instance.ObjectMeta.Annotations["operation.polyaxon.com/kind"]
36+
instanceKind, ok := instance.Annotations["operation.polyaxon.com/kind"]
3737
if !ok || instanceKind == "" {
3838
instanceKind = "operation" // backward compatibility
3939
}

‎internal/controller/job/cleanup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (r *JobReconciler) handlePastActiveDeadline(ctx context.Context, instance *
5858
return nil, nil
5959
}
6060
currentTime := metav1.Now()
61-
duration := currentTime.Time.Sub(startTime.Time)
61+
duration := currentTime.Sub(startTime.Time)
6262
allowedDuration := time.Second * time.Duration(*activeDeadlineSeconds)
6363
if duration >= allowedDuration {
6464
log.V(1).Info("Cleanup triggered based on ActiveDeadlineSeconds")

0 commit comments

Comments
 (0)