Skip to content

Commit f13b1a1

Browse files
darkowlzzdarkowlzz
committed
Simplify all the conditions.MarkTrue() reason refs
Signed-off-by: Sunny <darkowlzz@protonmail.com>
1 parent 2a9ac47 commit f13b1a1

File tree

4 files changed

+34
-46
lines changed

4 files changed

+34
-46
lines changed

‎controllers/bucket_controller.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,7 @@ func (r *BucketReconciler) reconcile(ctx context.Context, obj *sourcev1.Bucket,
328328
Err: fmt.Errorf("failed to create temporary working directory: %w", err),
329329
Reason: sourcev1.DirCreationFailedReason,
330330
}
331-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
332-
sourcev1.DirCreationFailedReason, e.Err.Error())
331+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
333332
return successEvent, sreconcile.ResultEmpty, e
334333
}
335334
defer func() {

‎controllers/gitrepository_controller.go

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,7 @@ func (r *GitRepositoryReconciler) reconcile(ctx context.Context, obj *sourcev1.G
229229
Err: fmt.Errorf("failed to create temporary working directory: %w", err),
230230
Reason: sourcev1.DirCreationFailedReason,
231231
}
232-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
233-
sourcev1.DirCreationFailedReason, e.Err.Error())
232+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
234233
return successEvent, sreconcile.ResultEmpty, e
235234
}
236235
defer func() {
@@ -348,7 +347,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context,
348347
Err: fmt.Errorf("failed to get secret '%s': %w", name.String(), err),
349348
Reason: sourcev1.AuthenticationFailedReason,
350349
}
351-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
350+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
352351
// Return error as the world as observed may change
353352
return sreconcile.ResultEmpty, e
354353
}
@@ -364,7 +363,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context,
364363
Err: fmt.Errorf("failed to configure auth strategy for Git implementation '%s': %w", obj.Spec.GitImplementation, err),
365364
Reason: sourcev1.AuthenticationFailedReason,
366365
}
367-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
366+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
368367
// Return error as the contents of the secret may change
369368
return sreconcile.ResultEmpty, e
370369
}
@@ -384,7 +383,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context,
384383
Err: fmt.Errorf("failed to configure checkout strategy for Git implementation '%s': %w", obj.Spec.GitImplementation, err),
385384
Reason: sourcev1.GitOperationFailedReason,
386385
}
387-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.GitOperationFailedReason, e.Err.Error())
386+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
388387
// Do not return err as recovery without changes is impossible
389388
return sreconcile.ResultEmpty, e
390389
}
@@ -398,7 +397,7 @@ func (r *GitRepositoryReconciler) reconcileSource(ctx context.Context,
398397
Err: fmt.Errorf("failed to checkout and determine revision: %w", err),
399398
Reason: sourcev1.GitOperationFailedReason,
400399
}
401-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.GitOperationFailedReason, e.Err.Error())
400+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
402401
// Coin flip on transient or persistent error, return error and hope for the best
403402
return sreconcile.ResultEmpty, e
404403
}
@@ -458,16 +457,14 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,
458457
Err: fmt.Errorf("failed to stat target artifact path: %w", err),
459458
Reason: sourcev1.StatOperationFailedReason,
460459
}
461-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
462-
sourcev1.StatOperationFailedReason, e.Err.Error())
460+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
463461
return sreconcile.ResultEmpty, e
464462
} else if !f.IsDir() {
465463
e := &serror.Event{
466464
Err: fmt.Errorf("invalid target path: '%s' is not a directory", dir),
467465
Reason: sourcev1.InvalidPathReason,
468466
}
469-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
470-
sourcev1.InvalidPathReason, e.Err.Error())
467+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
471468
return sreconcile.ResultEmpty, e
472469
}
473470

@@ -477,8 +474,7 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,
477474
Err: fmt.Errorf("failed to create artifact directory: %w", err),
478475
Reason: sourcev1.DirCreationFailedReason,
479476
}
480-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
481-
sourcev1.DirCreationFailedReason, e.Err.Error())
477+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
482478
return sreconcile.ResultEmpty, e
483479
}
484480
unlock, err := r.Storage.Lock(artifact)
@@ -508,8 +504,7 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,
508504
Err: fmt.Errorf("unable to archive artifact to storage: %w", err),
509505
Reason: sourcev1.ArchiveOperationFailedReason,
510506
}
511-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
512-
sourcev1.ArchiveOperationFailedReason, e.Err.Error())
507+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
513508
return sreconcile.ResultEmpty, e
514509
}
515510

‎controllers/helmchart_controller.go

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ func (r *HelmChartReconciler) reconcileSource(ctx context.Context, obj *sourcev1
326326
Err: fmt.Errorf("failed to get source: %w", err),
327327
Reason: "SourceUnavailable",
328328
}
329-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, "SourceUnavailable", e.Err.Error())
329+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
330330

331331
// Return Kubernetes client errors, but ignore others which can only be
332332
// solved by a change in generation
@@ -416,7 +416,7 @@ func (r *HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj *
416416
Err: fmt.Errorf("failed to get secret '%s': %w", repo.Spec.SecretRef.Name, err),
417417
Reason: sourcev1.AuthenticationFailedReason,
418418
}
419-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
419+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
420420
// Return error as the world as observed may change
421421
return sreconcile.ResultEmpty, e
422422
}
@@ -428,7 +428,7 @@ func (r *HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj *
428428
Err: fmt.Errorf("failed to configure Helm client with secret data: %w", err),
429429
Reason: sourcev1.AuthenticationFailedReason,
430430
}
431-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
431+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
432432
// Requeue as content of secret might change
433433
return sreconcile.ResultEmpty, e
434434
}
@@ -440,7 +440,7 @@ func (r *HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj *
440440
Err: fmt.Errorf("failed to create TLS client config with secret data: %w", err),
441441
Reason: sourcev1.AuthenticationFailedReason,
442442
}
443-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
443+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
444444
// Requeue as content of secret might change
445445
return sreconcile.ResultEmpty, e
446446
}
@@ -457,14 +457,14 @@ func (r *HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj *
457457
Err: fmt.Errorf("invalid Helm repository URL: %w", err),
458458
Reason: sourcev1.URLInvalidReason,
459459
}
460-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.URLInvalidReason, e.Err.Error())
460+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
461461
return sreconcile.ResultEmpty, e
462462
default:
463463
e := &serror.Stalling{
464464
Err: fmt.Errorf("failed to construct Helm client: %w", err),
465465
Reason: meta.FailedReason,
466466
}
467-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, meta.FailedReason, e.Err.Error())
467+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
468468
return sreconcile.ResultEmpty, e
469469
}
470470
}
@@ -509,7 +509,7 @@ func (r *HelmChartReconciler) buildFromTarballArtifact(ctx context.Context, obj
509509
Err: fmt.Errorf("failed to create temporary working directory: %w", err),
510510
Reason: sourcev1.DirCreationFailedReason,
511511
}
512-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.DirCreationFailedReason, e.Err.Error())
512+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
513513
return sreconcile.ResultEmpty, e
514514
}
515515
defer os.RemoveAll(tmpDir)
@@ -521,7 +521,7 @@ func (r *HelmChartReconciler) buildFromTarballArtifact(ctx context.Context, obj
521521
Err: fmt.Errorf("failed to create directory to untar source into: %w", err),
522522
Reason: sourcev1.DirCreationFailedReason,
523523
}
524-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.DirCreationFailedReason, e.Err.Error())
524+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
525525
return sreconcile.ResultEmpty, e
526526
}
527527

@@ -532,7 +532,7 @@ func (r *HelmChartReconciler) buildFromTarballArtifact(ctx context.Context, obj
532532
Err: fmt.Errorf("failed to open source artifact: %w", err),
533533
Reason: sourcev1.ReadOperationFailedReason,
534534
}
535-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.ReadOperationFailedReason, e.Err.Error())
535+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
536536
return sreconcile.ResultEmpty, e
537537
}
538538
if _, err = untar.Untar(f, sourceDir); err != nil {
@@ -556,7 +556,7 @@ func (r *HelmChartReconciler) buildFromTarballArtifact(ctx context.Context, obj
556556
Err: fmt.Errorf("path calculation for chart '%s' failed: %w", obj.Spec.Chart, err),
557557
Reason: "IllegalPath",
558558
}
559-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, "IllegalPath", e.Err.Error())
559+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
560560
// We are unable to recover from this change without a change in generation
561561
return sreconcile.ResultEmpty, e
562562
}
@@ -664,8 +664,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
664664
Err: fmt.Errorf("failed to create artifact directory: %w", err),
665665
Reason: sourcev1.DirCreationFailedReason,
666666
}
667-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
668-
sourcev1.DirCreationFailedReason, e.Err.Error())
667+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
669668
return sreconcile.ResultEmpty, e
670669
}
671670
unlock, err := r.Storage.Lock(artifact)
@@ -674,8 +673,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
674673
Err: fmt.Errorf("failed to acquire lock for artifact: %w", err),
675674
Reason: sourcev1.AcquireLockFailedReason,
676675
}
677-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
678-
sourcev1.AcquireLockFailedReason, e.Err.Error())
676+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
679677
return sreconcile.ResultEmpty, e
680678
}
681679
defer unlock()
@@ -686,8 +684,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
686684
Err: fmt.Errorf("unable to copy Helm chart to storage: %w", err),
687685
Reason: sourcev1.ArchiveOperationFailedReason,
688686
}
689-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
690-
sourcev1.ArchiveOperationFailedReason, e.Err.Error())
687+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
691688
return sreconcile.ResultEmpty, e
692689
}
693690

‎controllers/helmrepository_controller.go

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ func (r *HelmRepositoryReconciler) reconcile(ctx context.Context, obj *sourcev1.
242242
Err: fmt.Errorf("unable to read the artifact: %w", err),
243243
Reason: sourcev1.ReadOperationFailedReason,
244244
}
245-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
246-
sourcev1.ReadOperationFailedReason, e.Err.Error())
245+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
247246
return successEvent, sreconcile.ResultEmpty, e
248247
}
249248
size := units.HumanSize(float64(fi.Size()))
@@ -325,7 +324,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
325324
Err: fmt.Errorf("failed to get secret '%s': %w", name.String(), err),
326325
Reason: sourcev1.AuthenticationFailedReason,
327326
}
328-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
327+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
329328
return sreconcile.ResultEmpty, e
330329
}
331330

@@ -336,7 +335,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
336335
Err: fmt.Errorf("failed to configure Helm client with secret data: %w", err),
337336
Reason: sourcev1.AuthenticationFailedReason,
338337
}
339-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
338+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
340339
// Return err as the content of the secret may change.
341340
return sreconcile.ResultEmpty, e
342341
}
@@ -348,7 +347,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
348347
Err: fmt.Errorf("failed to create TLS client config with secret data: %w", err),
349348
Reason: sourcev1.AuthenticationFailedReason,
350349
}
351-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.AuthenticationFailedReason, e.Err.Error())
350+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
352351
// Requeue as content of secret might change
353352
return sreconcile.ResultEmpty, e
354353
}
@@ -363,14 +362,14 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
363362
Err: fmt.Errorf("invalid Helm repository URL: %w", err),
364363
Reason: sourcev1.URLInvalidReason,
365364
}
366-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.URLInvalidReason, e.Err.Error())
365+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
367366
return sreconcile.ResultEmpty, e
368367
default:
369368
e := &serror.Stalling{
370369
Err: fmt.Errorf("failed to construct Helm client: %w", err),
371370
Reason: meta.FailedReason,
372371
}
373-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, meta.FailedReason, e.Err.Error())
372+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
374373
return sreconcile.ResultEmpty, e
375374
}
376375
}
@@ -380,7 +379,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
380379
Err: fmt.Errorf("failed to fetch Helm repository index: %w", err),
381380
Reason: meta.FailedReason,
382381
}
383-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, meta.FailedReason, e.Err.Error())
382+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
384383
// Coin flip on transient or persistent error, return error and hope for the best
385384
return sreconcile.ResultEmpty, e
386385
}
@@ -390,9 +389,9 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
390389
if err := chartRepo.LoadFromCache(); err != nil {
391390
e := &serror.Event{
392391
Err: fmt.Errorf("failed to load Helm repository from cache: %w", err),
393-
Reason: sourcev1.FetchFailedCondition,
392+
Reason: sourcev1.IndexationFailedReason,
394393
}
395-
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, sourcev1.IndexationFailedReason, e.Err.Error())
394+
conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
396395
return sreconcile.ResultEmpty, e
397396
}
398397
defer chartRepo.Unload()
@@ -449,8 +448,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
449448
Err: fmt.Errorf("failed to create artifact directory: %w", err),
450449
Reason: sourcev1.DirCreationFailedReason,
451450
}
452-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
453-
sourcev1.DirCreationFailedReason, e.Err.Error())
451+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
454452
return sreconcile.ResultEmpty, e
455453
}
456454

@@ -470,8 +468,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
470468
Err: fmt.Errorf("unable to save artifact to storage: %w", err),
471469
Reason: sourcev1.ArchiveOperationFailedReason,
472470
}
473-
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition,
474-
sourcev1.ArchiveOperationFailedReason, e.Err.Error())
471+
conditions.MarkTrue(obj, sourcev1.StorageOperationFailedCondition, e.Reason, e.Err.Error())
475472
return sreconcile.ResultEmpty, e
476473
}
477474

0 commit comments

Comments
 (0)