lukaszraczylo/kubernetes-images-sync-operator
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/kubernetes-images-sync-operator.git synced 2026-06-10 23:29:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! General improvements

Browse Source
This commit is contained in:
Lukasz Raczylo
2025-01-10 15:15:20 +00:00
parent cc066a2502
commit d6707cf25d
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/raczylo.com/clusterimageexport_controller.go
+13 -8
View File
@@ -44,7 +44,7 @@ func (r *ClusterImageExportReconciler) InjectPodAnnotations(annotations map[stri
// +kubebuilder:rbac:groups=batch,resources=cronjobs,verbs=get;list;watch
// +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch;create;update;patch;delete
const clusterImageExportFinalizer = "finalizer.clusterimageexport.raczylo.com"
const clusterImageExportFinalizer = "raczylo.com/clusterimageexport-finalizer"
func (r *ClusterImageExportReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
l := log.FromContext(ctx)
@@ -308,7 +308,7 @@ func (r *ClusterImageExportReconciler) handleDeletion(ctx context.Context, clust
// Continue with deletion even if cleanup fails
}
// Check if cleanup job already exists
// Delete existing cleanup job if it exists
jobName := "cleanup-" + shared.NormalizeImageName(clusterImageExport.Name)
existingJob := &batchv1.Job{}
err := r.Get(ctx, client.ObjectKey{
@@ -317,16 +317,21 @@ func (r *ClusterImageExportReconciler) handleDeletion(ctx context.Context, clust
}, existingJob)
if err == nil {
// Job exists, don't create a new one
l.Info("Cleanup job already exists, skipping creation", "job", jobName)
} else if errors.IsNotFound(err) {
// Job doesn't exist, create it
r.runCleanupJob(ctx, clusterImageExport)
} else {
// Job exists, delete it
if err := r.Delete(ctx, existingJob); err != nil && !errors.IsNotFound(err) {
l.Error(err, "Failed to delete existing cleanup job")
// Continue with deletion even if cleanup job deletion fails
} else {
l.Info("Successfully deleted existing cleanup job", "job", jobName)
}
} else if !errors.IsNotFound(err) {
// Unexpected error, log but continue
l.Error(err, "Error checking for existing cleanup job")
}
// Create new cleanup job
r.runCleanupJob(ctx, clusterImageExport)
// Remove the finalizer regardless of cleanup job status
controllerutil.RemoveFinalizer(clusterImageExport, clusterImageExportFinalizer)
if err := r.Update(ctx, clusterImageExport); err != nil {