lukaszraczylo/kubernetes-images-sync-operator
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/kubernetes-images-sync-operator.git synced 2026-06-30 02:54:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lukasz Raczylo
2025-01-10 13:08:43 +00:00
parent 22ff5f69f9
commit 970908555b
4 changed files with 104 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart/Chart.yaml
+2 -2
View File
@@ -10,9 +10,9 @@ description: |
type: application
version: 0.2.32
version: 0.2.33
appVersion: "0.2.32"
appVersion: "0.2.33"
home: https://github.com/lukaszraczylo/kubernetes-images-sync-operator
chart/values.yaml
+1 -1
View File
@@ -12,7 +12,7 @@ sa:
- ALL
image:
repository: ghcr.io/lukaszraczylo/kubernetes-images-sync-operator
tag: 0.2.32
tag: 0.2.33
resources:
limits:
cpu: 500m
internal/controller/raczylo.com/clusterimage_controller.go
+92 -13
View File
@@ -61,8 +61,18 @@ func (r *ClusterImageReconciler) Reconcile(ctx context.Context, req ctrl.Request
// If the ClusterImage is new, set its status to PENDING
if clusterImage.Status.Progress == "" {
clusterImage.Status.Progress = shared.STATUS_PENDING
if err := r.Status().Update(ctx, clusterImage); err != nil {
// Get the latest version before updating
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, req.NamespacedName, latest); err != nil {
return ctrl.Result{}, err
}
latest.Status.Progress = shared.STATUS_PENDING
if err := r.Status().Update(ctx, latest); err != nil {
if errors.IsConflict(err) {
// Resource was modified, requeue and try again
return ctrl.Result{Requeue: true}, nil
}
l.Error(err, "unable to update ClusterImage status to PENDING")
return ctrl.Result{}, err
}
@@ -89,6 +99,12 @@ func (r *ClusterImageReconciler) Reconcile(ctx context.Context, req ctrl.Request
}
func (r *ClusterImageReconciler) handlePendingClusterImage(ctx context.Context, clusterImage *raczylocomv1.ClusterImage, l logr.Logger) (ctrl.Result, error) {
// Get the latest version before proceeding
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return ctrl.Result{}, err
}
clusterImage = latest
// Check if the image is present
exists, err := r.checkImageExists(ctx, clusterImage)
if err != nil {
@@ -96,8 +112,18 @@ func (r *ClusterImageReconciler) handlePendingClusterImage(ctx context.Context,
return ctrl.Result{}, err
}
if exists {
clusterImage.Status.Progress = shared.STATUS_PRESENT
if err := r.Status().Update(ctx, clusterImage); err != nil {
// Get latest version before updating status
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return ctrl.Result{}, err
}
latest.Status.Progress = shared.STATUS_PRESENT
if err := r.Status().Update(ctx, latest); err != nil {
if errors.IsConflict(err) {
// Resource was modified, requeue and try again
return ctrl.Result{Requeue: true}, nil
}
l.Error(err, "unable to update ClusterImage status")
return ctrl.Result{}, err
}
@@ -166,11 +192,22 @@ func (r *ClusterImageReconciler) handleRunningClusterImage(ctx context.Context,
}
// Check job status and update ClusterImage accordingly
// Get latest version before updating status
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return ctrl.Result{}, err
}
clusterImage = latest
if existingJob.Status.Succeeded > 0 {
clusterImage.Status.Progress = shared.STATUS_SUCCESS
r.ActiveJobs--
// Update the status before cleaning up the job
if err := r.Status().Update(ctx, clusterImage); err != nil {
if errors.IsConflict(err) {
// Resource was modified, requeue and try again
return ctrl.Result{Requeue: true}, nil
}
l.Error(err, "unable to update ClusterImage status to SUCCESS")
return ctrl.Result{}, err
}
@@ -187,10 +224,20 @@ func (r *ClusterImageReconciler) handleRunningClusterImage(ctx context.Context,
return ctrl.Result{}, err
}
// Get latest version before updating status
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return ctrl.Result{}, err
}
// Update status and retry count
clusterImage.Status.Progress = shared.STATUS_RETRYING
clusterImage.Status.RetryCount++
if err := r.Status().Update(ctx, clusterImage); err != nil {
latest.Status.Progress = shared.STATUS_RETRYING
latest.Status.RetryCount++
if err := r.Status().Update(ctx, latest); err != nil {
if errors.IsConflict(err) {
// Resource was modified, requeue and try again
return ctrl.Result{Requeue: true}, nil
}
l.Error(err, "unable to update ClusterImage status for retry")
return ctrl.Result{}, err
}
@@ -199,9 +246,19 @@ func (r *ClusterImageReconciler) handleRunningClusterImage(ctx context.Context,
return ctrl.Result{Requeue: true}, nil
}
// Get latest version before updating status
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return ctrl.Result{}, err
}
// Max retries reached, mark as failed
clusterImage.Status.Progress = shared.STATUS_FAILED
if err := r.Status().Update(ctx, clusterImage); err != nil {
latest.Status.Progress = shared.STATUS_FAILED
if err := r.Status().Update(ctx, latest); err != nil {
if errors.IsConflict(err) {
// Resource was modified, requeue and try again
return ctrl.Result{Requeue: true}, nil
}
l.Error(err, "unable to update ClusterImage status to FAILED")
return ctrl.Result{}, err
}
@@ -396,9 +453,20 @@ func (r *ClusterImageReconciler) handleJobRestarts(ctx context.Context, job *v1b
clusterImage.Status.RetryCount += newRestarts
if clusterImage.Status.RetryCount >= 3 {
// Get latest version before updating status
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return err
}
// Max retries reached
clusterImage.Status.Progress = shared.STATUS_FAILED
if err := r.Status().Update(ctx, clusterImage); err != nil {
latest.Status.Progress = shared.STATUS_FAILED
latest.Status.RetryCount = clusterImage.Status.RetryCount
if err := r.Status().Update(ctx, latest); err != nil {
if errors.IsConflict(err) {
// Resource was modified, try again
return nil
}
return fmt.Errorf("failed to update status to FAILED: %w", err)
}
@@ -407,9 +475,20 @@ func (r *ClusterImageReconciler) handleJobRestarts(ctx context.Context, job *v1b
return fmt.Errorf("failed to cleanup resources: %w", err)
}
} else {
// Get latest version before updating status
latest := &raczylocomv1.ClusterImage{}
if err := r.Get(ctx, types.NamespacedName{Name: clusterImage.Name, Namespace: clusterImage.Namespace}, latest); err != nil {
return err
}
// Still have retries left
clusterImage.Status.Progress = shared.STATUS_RETRYING
if err := r.Status().Update(ctx, clusterImage); err != nil {
latest.Status.Progress = shared.STATUS_RETRYING
latest.Status.RetryCount = clusterImage.Status.RetryCount
if err := r.Status().Update(ctx, latest); err != nil {
if errors.IsConflict(err) {
// Resource was modified, try again
return nil
}
return fmt.Errorf("failed to update status to RETRYING: %w", err)
}
}
internal/controller/raczylo.com/clusterimageexport_controller.go
+9 -3
View File
@@ -81,10 +81,16 @@ func (r *ClusterImageExportReconciler) Reconcile(ctx context.Context, req ctrl.R
}
}
// Early return if the ClusterImageExport is already in a completed state
// Reset status if the ClusterImageExport is in a completed state
if clusterImageExport.Status.Progress == shared.STATUS_SUCCESS || clusterImageExport.Status.Progress == shared.STATUS_FAILED {
l.Info("ClusterImageExport is already in a completed state", "Status", clusterImageExport.Status.Progress)
return ctrl.Result{}, nil
// Reset the status to allow reprocessing
clusterImageExport.Status.Progress = ""
if err := r.Status().Update(ctx, clusterImageExport); err != nil {
l.Error(err, "unable to reset ClusterImageExport status")
return ctrl.Result{}, err
}
// Requeue to process with reset status
return ctrl.Result{Requeue: true}, nil
}
// If the status is empty, set it to PENDING