Merge pull request #16 from cybozu-go/fix-late-ready-node

Add handling for node readiness changes

Author: zeroalphat

internal/controller/imageprefetch_controller.go

@@ -16,6 +16,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	metav1apply "k8s.io/client-go/applyconfigurations/meta/v1"
@@ -540,6 +541,32 @@ func (r *ImagePrefetchReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 			var requests []ctrl.Request
 			for _, imgPrefetch := range imagePrefetchList.Items {
+				if imgPrefetch.Spec.AllNodes {
+					if util.IsLabelSelectorEmpty(&imgPrefetch.Spec.NodeSelector) {
+						requests = append(requests, ctrl.Request{
+							NamespacedName: types.NamespacedName{
+								Namespace: imgPrefetch.Namespace,
+								Name:      imgPrefetch.Name,
+							},
+						})
+						continue
+					}
+
+					selector, err := metav1.LabelSelectorAsSelector(&imgPrefetch.Spec.NodeSelector)
+					if err != nil {
+						return nil
+					}
+					if selector.Matches(labels.Set(node.Labels)) {
+						requests = append(requests, ctrl.Request{
+							NamespacedName: types.NamespacedName{
+								Namespace: imgPrefetch.Namespace,
+								Name:      imgPrefetch.Name,
+							},
+						})
+					}
+					continue
+				}
+
 				if slices.Contains(imgPrefetch.Status.SelectedNodes, node.Name) {
 					requests = append(requests, ctrl.Request{
 						NamespacedName: types.NamespacedName{
@@ -560,6 +587,9 @@ func (r *ImagePrefetchReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			nodeImageSetHandler,
 			builder.WithPredicates(
 				predicate.Funcs{
+					CreateFunc: func(e event.CreateEvent) bool {
+						return false
+					},
 					UpdateFunc: func(e event.UpdateEvent) bool {
 						return true
 					},
@@ -577,6 +607,20 @@ func (r *ImagePrefetchReconciler) SetupWithManager(mgr ctrl.Manager) error {
 					CreateFunc: func(e event.CreateEvent) bool {
 						return true
 					},
+					UpdateFunc: func(e event.UpdateEvent) bool {
+						oldNode := e.ObjectOld.(*corev1.Node)
+						newNode := e.ObjectNew.(*corev1.Node)
+						// change node status from not ready to ready
+						if !util.IsNodeReady(oldNode) && util.IsNodeReady(newNode) {
+							return true
+						}
+						// change node status from ready to not ready
+						if util.IsNodeReady(oldNode) && !util.IsNodeReady(newNode) {
+							return true
+						}
+
+						return false
+					},
 					DeleteFunc: func(e event.DeleteEvent) bool {
 						return true
 					},