Fix workload flatnetwork label not updated

cnrancher · Sep 4, 2024 · 1c3b4eb · 1c3b4eb
1 parent c90bc46
commit 1c3b4eb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/pkg/admission/webhook/workload.go b/pkg/admission/webhook/workload.go
@@ -82,7 +82,8 @@ func (h *Handler) validateWorkload(ar *admissionv1.AdmissionReview) (bool, error
 	if err != nil {
 		return false, fmt.Errorf("deserializeWorkloadReview: %w", err)
 	}
-	if workload.PodTemplateAnnotations("k8s.v1.cni.cncf.io/networks") == "" {
+	if workload.PodTemplateAnnotations("k8s.v1.cni.cncf.io/networks") == "" &&
+		workload.PodTemplateAnnotations("v1.multus-cni.io/default-network") == "" {
 		return true, nil
 	}
 	if workload.PodTemplateAnnotations(flv1.AnnotationSubnet) == "" {

diff --git a/pkg/apis/flatnetwork.pandaria.io/v1/types.go b/pkg/apis/flatnetwork.pandaria.io/v1/types.go
@@ -27,9 +27,11 @@ const (
 	LabelWorkloadSelector = "workload.user.cattle.io/workloadselector"
 	LabelProjectID        = "field.cattle.io/projectId"
 
+	// Specification for IP/MAC Allocation modes
 	AllocateModeAuto     = "auto"
 	AllocateModeSpecific = "specific"
 
+	// Specification for flatModes
 	FlatModeIPvlan  = "ipvlan"
 	FlatModeMacvlan = "macvlan"
 )

diff --git a/pkg/controller/workload/workload.go b/pkg/controller/workload/workload.go
@@ -71,8 +71,10 @@ func syncWorkload[T Workload](_ string, w T) (T, error) {
 		return w, nil
 	}
 
-	isFlatNetworkEnabled, labels := getFlatNetworkLabel(w)
+	isFlatNetworkEnabled, labels := getTemplateFlatNetworkLabel(w)
 	if !isFlatNetworkEnabled {
+		logrus.WithFields(fieldsWorkload(w)).
+			Debugf("skip update workload label as flatnetwork not enabled")
 		return w, nil
 	}
 	o, err := workloadHandler.updateWorkloadLabel(w, labels)
@@ -85,7 +87,9 @@ func syncWorkload[T Workload](_ string, w T) (T, error) {
 	return w, err
 }
 
-func getFlatNetworkLabel(w metav1.Object) (isFlatNetworkEnabled bool, labels map[string]string) {
+func getTemplateFlatNetworkLabel(
+	w metav1.Object,
+) (isFlatNetworkEnabled bool, labels map[string]string) {
 	m := GetTemplateObjectMeta(w)
 	if m == nil {
 		return false, nil
@@ -99,16 +103,15 @@ func getFlatNetworkLabel(w metav1.Object) (isFlatNetworkEnabled bool, labels map
 		ipType string
 		subnet string
 	)
-	switch a[flv1.LabelFlatNetworkIPType] {
+	switch a[flv1.AnnotationIP] {
 	case flv1.AllocateModeAuto:
 		ipType = flv1.AllocateModeAuto
-		isFlatNetworkEnabled = true
 	case "":
 	default:
 		ipType = flv1.AllocateModeSpecific
-		isFlatNetworkEnabled = true
 	}
 	subnet = a[flv1.AnnotationSubnet]
+	isFlatNetworkEnabled = (ipType != "" && subnet != "")
 
 	labels = map[string]string{
 		flv1.LabelFlatNetworkIPType: ipType,