Merge pull request #231 from OrangeBao/main

feat: allow some daemonset pod
kosmos-io · Nov 12, 2023 · 111d483 · 111d483
2 parents fd8d5b3 + bafe53b
commit 111d483
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/clustertree/cluster-manager/controllers/pod/root_pod_controller.go b/pkg/clustertree/cluster-manager/controllers/pod/root_pod_controller.go
@@ -242,6 +242,11 @@ func (r *RootPodReconciler) SetupWithManager(mgr manager.Manager) error {
 		if p.OwnerReferences != nil && len(p.OwnerReferences) > 0 {
 			for _, or := range p.OwnerReferences {
 				if or.Kind == "DaemonSet" {
+					if p.Annotations != nil {
+						if _, ok := p.Annotations[utils.KosmosDaemonsetAllowAnnotations]; ok {
+							return true
+						}
+					}
 					return false
 				}
 			}

diff --git a/pkg/utils/constants.go b/pkg/utils/constants.go
@@ -77,6 +77,8 @@ const (
 	KosmosResourceOwnersAnnotations     = "kosmos-io/cluster-owners"
 	KosmosNodeOwnedByClusterAnnotations = "kosmos-io/owned-by-cluster"
 
+	KosmosDaemonsetAllowAnnotations = "kosmos-io/daemonset-allow"
+
 	NodeRoleLabel         = "kubernetes.io/role"
 	NodeRoleValue         = "agent"
 	NodeOSLabelBeta       = "beta.kubernetes.io/os"