@@ -1069,6 +1069,7 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) error {
1069
1069
key := fmt .Sprintf ("%s/%s" , pod .Namespace , podName )
1070
1070
targetPortNameList := strset .NewWithSize (len (podNets ))
1071
1071
portsNeedToDel := []string {}
1072
+ annotationsNeedToDel := []string {}
1072
1073
subnetUsedByPort := make (map [string ]string )
1073
1074
1074
1075
for _ , podNet := range podNets {
@@ -1086,6 +1087,12 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) error {
1086
1087
if ! targetPortNameList .Has (port .Name ) {
1087
1088
portsNeedToDel = append (portsNeedToDel , port .Name )
1088
1089
subnetUsedByPort [port .Name ] = port .ExternalIDs ["ls" ]
1090
+ portNameSlice := strings .Split (port .Name , "." )
1091
+ providerName := strings .Join (portNameSlice [2 :], "." )
1092
+ if providerName == util .OvnProvider {
1093
+ continue
1094
+ }
1095
+ annotationsNeedToDel = append (annotationsNeedToDel , providerName )
1089
1096
}
1090
1097
}
1091
1098
@@ -1111,6 +1118,14 @@ func (c *Controller) syncKubeOvnNet(pod *v1.Pod, podNets []*kubeovnNet) error {
1111
1118
}
1112
1119
}
1113
1120
1121
+ for _ , providerName := range annotationsNeedToDel {
1122
+ for annotationKey := range pod .Annotations {
1123
+ if strings .HasPrefix (key , providerName ) {
1124
+ delete (pod .Annotations , annotationKey )
1125
+ }
1126
+ }
1127
+ }
1128
+
1114
1129
return nil
1115
1130
}
1116
1131
0 commit comments