feat: make cluster and namespace level ConvertPolicy available

Signed-off-by: ONE7live <[email protected]>

pkg/apis/kosmos/v1alpha1/clusterpodconvertpolicy_types.go

@@ -0,0 +1,46 @@
+package v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +genclient:nonNamespaced
+// +kubebuilder:resource:scope="Cluster"
+// +kubebuilder:subresource:status
+// +kubebuilder:resource:shortName=cpcp
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type ClusterPodConvertPolicy struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	// Spec is the specification for the behaviour of the ClusterPodConvertPolicy.
+	// +required
+	Spec ClusterPodConvertPolicySpec `json:"spec"`
+}
+
+type ClusterPodConvertPolicySpec struct {
+	// A label query over a set of resources.
+	// If name is not empty, labelSelector will be ignored.
+	// +required
+	LabelSelector metav1.LabelSelector `json:"labelSelector"`
+
+	// A label query over a set of resources.
+	// If name is not empty, LeafNodeSelector will be ignored.
+	// +option
+	LeafNodeSelector *metav1.LabelSelector `json:"leafNodeSelector,omitempty"`
+
+	// Converters are some converter for convert pod when pod synced from root cluster to leaf cluster
+	// pod will use these converters to scheduled in leaf cluster
+	// +optional
+	Converters *Converters `json:"converters,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type ClusterPodConvertPolicyList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+	Items           []ClusterPodConvertPolicy `json:"items"`
+}

pkg/apis/kosmos/v1alpha1/podconvertpolicy_types.go

@@ -6,15 +6,16 @@ import (
 )
 
 // +genclient
+// +kubebuilder:resource:scope="Namespaced"
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:shortName=pc;pcs
+// +kubebuilder:resource:shortName=pcp
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type PodConvertPolicy struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// Spec is the specification for the behaviour of the podConversion.
+	// Spec is the specification for the behaviour of the PodConvertPolicy.
 	// +required
 	Spec PodConvertPolicySpec `json:"spec"`
 }
@@ -50,6 +51,8 @@ type Converters struct {
 	AffinityConverter *AffinityConverter `json:"affinityConverter,omitempty"`
 	// +optional
 	TopologySpreadConstraintsConverter *TopologySpreadConstraintsConverter `json:"topologySpreadConstraintsConverter,omitempty"`
+	// +optional
+	HostAliasesConverter *HostAliasesConverter `json:"hostAliasesConverter,omitempty"`
 }
 
 // ConvertType if the operation type when convert pod from root cluster to leaf cluster.
@@ -125,6 +128,17 @@ type TopologySpreadConstraintsConverter struct {
 	TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
 }
 
+// HostAliasesConverter is an optional list of hosts and IPs that will be injected into the pod's hosts file if specified.
+// This is only valid for non-hostNetwork pods.
+type HostAliasesConverter struct {
+	// +kubebuilder:validation:Enum=add;remove;replace
+	// +required
+	ConvertType ConvertType `json:"convertType"`
+
+	// +optional
+	HostAliases []corev1.HostAlias `json:"hostAliases,omitempty"`
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type PodConvertPolicyList struct {

pkg/clustertree/cluster-manager/controllers/pod/root_pod_controller.go

@@ -800,14 +800,21 @@ func (r *RootPodReconciler) createVolumes(ctx context.Context, lr *leafUtils.Lea
 func (r *RootPodReconciler) mutatePod(ctx context.Context, pod *corev1.Pod, nodeName string) error {
 	klog.V(4).Infof("Converting pod %v/%+v", pod.Namespace, pod.Name)
 
-	podConvertPolicyList := &kosmosv1alpha1.PodConvertPolicyList{}
-	err := r.Client.List(ctx, podConvertPolicyList, &client.ListOptions{
+	cpcpList := &kosmosv1alpha1.ClusterPodConvertPolicyList{}
+	err := r.Client.List(ctx, cpcpList, &client.ListOptions{})
+	if err != nil {
+		return fmt.Errorf("list cluster pod convert policy error: %v", err)
+	}
+
+	pcpList := &kosmosv1alpha1.PodConvertPolicyList{}
+	err = r.Client.List(ctx, pcpList, &client.ListOptions{
 		Namespace: pod.Namespace,
 	})
 	if err != nil {
-		return fmt.Errorf("list convert policy error: %v", err)
+		return fmt.Errorf("list pod convert policy error: %v", err)
 	}
-	if len(podConvertPolicyList.Items) <= 0 {
+
+	if len(cpcpList.Items) <= 0 && len(pcpList.Items) <= 0 {
 		// no matched policy, skip
 		return nil
 	}
@@ -818,11 +825,20 @@ func (r *RootPodReconciler) mutatePod(ctx context.Context, pod *corev1.Pod, node
 		return fmt.Errorf("get node error: %v, nodeName: %s", err, pod.Spec.NodeName)
 	}
 
-	matchedPolicy, err := convertpolicy.GetMatchPodConvertPolicy(*podConvertPolicyList, pod.Labels, rootNode.Labels)
-	if err != nil {
-		return fmt.Errorf("get convert policy error: %v", err)
+	if len(cpcpList.Items) > 0 {
+		matchedPolicy, err := convertpolicy.GetMatchClusterPodConvertPolicy(*cpcpList, pod.Labels, rootNode.Labels)
+		if err != nil {
+			return fmt.Errorf("get pod convert policy error: %v", err)
+		}
+		podutils.ConvertPod(pod, matchedPolicy, nil)
+	} else {
+		matchedPolicy, err := convertpolicy.GetMatchPodConvertPolicy(*pcpList, pod.Labels, rootNode.Labels)
+		if err != nil {
+			return fmt.Errorf("get pod convert policy error: %v", err)
+		}
+		podutils.ConvertPod(pod, nil, matchedPolicy)
 	}
-	podutils.ConvertPod(pod, matchedPolicy)
+
 	klog.V(4).Infof("Convert pod %v/%+v success", pod.Namespace, pod.Name)
 	return nil
 }