ignore update pod nic annotation when is not nil

kubeovn · Jun 10, 2021 · cb8cc64 · cb8cc64
1 parent 14c8ad7
commit cb8cc64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -407,7 +407,9 @@ func (c *Controller) handleAddPod(key string) error {
 		pod.Annotations[fmt.Sprintf(util.GatewayAnnotationTemplate, podNet.ProviderName)] = subnet.Spec.Gateway
 		pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, podNet.ProviderName)] = subnet.Name
 		pod.Annotations[fmt.Sprintf(util.AllocatedAnnotationTemplate, podNet.ProviderName)] = "true"
-		pod.Annotations[util.PodNicAnnotation] = c.config.PodNicType
+		if pod.Annotations[util.PodNicAnnotation] == "" {
+			pod.Annotations[util.PodNicAnnotation] = c.config.PodNicType
+		}
 
 		if err := util.ValidatePodCidr(podNet.Subnet.Spec.CIDRBlock, ipStr); err != nil {
 			klog.Errorf("validate pod %s/%s failed, %v", namespace, name, err)

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -338,7 +338,6 @@ func (c Client) ListLogicalEntity(entity string, args ...string) ([]string, erro
 	return result, nil
 }
 
-
 func (c Client) LogicalSwitchExists(logicalSwitch string) (bool, error) {
 	lss, err := c.ListLogicalSwitch()
 	if err != nil {