Skip to content

Daemonsets OwnerRef cleanup labels #1761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Daemonsets OwnerRef cleanup labels #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions controllers/clusterpolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@ func updateCRState(ctx context.Context, r *ClusterPolicyReconciler, namespacedNa
}
}

func isOwnedByDaemonSet(ownerRefs []metav1.OwnerReference) bool {

for _, ownerRef := range ownerRefs {
if ownerRef.Kind == "DaemonSet" && ownerRef.Controller != nil && *ownerRef.Controller {
return true
}
}
return false
}

func addWatchNewGPUNode(r *ClusterPolicyReconciler, c controller.Controller, mgr ctrl.Manager) error {
// Define a mapping from the Node object in the event to one or more
// ClusterPolicy objects to Reconcile
Expand Down Expand Up @@ -288,6 +298,14 @@ func addWatchNewGPUNode(r *ClusterPolicyReconciler, c controller.Controller, mgr
return hasGPULabels(labels)
},
UpdateFunc: func(e event.TypedUpdateEvent[*corev1.Node]) bool {
r.Log.Info("SHIVAAAAAAAA Calling labels: UpdateFunc", "labels", e.ObjectNew.GetLabels())

ownerRefs := e.ObjectNew.GetOwnerReferences()
if isOwnedByDaemonSet(ownerRefs) {
return false
}
r.Log.Info("SHIVAAAAAAAA Calling labels: UpdateFunc", "ownerRefs", ownerRefs)

newLabels := e.ObjectNew.GetLabels()
oldLabels := e.ObjectOld.GetLabels()
nodeName := e.ObjectNew.GetName()
Expand Down Expand Up @@ -323,6 +341,7 @@ func addWatchNewGPUNode(r *ClusterPolicyReconciler, c controller.Controller, mgr
"osTreeLabelChanged", osTreeLabelChanged,
)
}
r.Log.Info("SHIVAAAAAAAA Calling labels: UpdateFunc", "needsUpdate", needsUpdate)
return needsUpdate
},
DeleteFunc: func(e event.TypedDeleteEvent[*corev1.Node]) bool {
Expand Down
1 change: 1 addition & 0 deletions controllers/state_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ func (n *ClusterPolicyController) init(ctx context.Context, reconciler *ClusterP
n.logger.Info("Pod Security Admission labels added to GPU Operator namespace", "namespace", n.operatorNamespace)
}

n.logger.Info("SHIVAAAAAAAA Calling labels: namespace, hasNFDLabels", "namespace", n.operatorNamespace, "hasNFDLabels", n.hasNFDLabels)
// fetch all nodes and label gpu nodes
hasNFDLabels, gpuNodeCount, err := n.labelGPUNodes()
if err != nil {
Expand Down
Loading