Merge pull request #1125 from Nordix/ensure-trunk-deletion

k8s-ci-robot · web-flow · commit f83520c50342 · 2022-02-01T05:32:19.000-08:00
✨  Ensure trunk deletion
diff --git a/hack/ci/cloud-init/controller.yaml.tpl b/hack/ci/cloud-init/controller.yaml.tpl
@@ -35,7 +35,8 @@
     ENABLED_SERVICES+=,g-api
 
     # Neutron
-    ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3
+    ENABLED_SERVICES+=,neutron-api,neutron-agent,neutron-dhcp,neutron-l3,neutron-trunk
+
     ENABLED_SERVICES+=,neutron-metadata-agent,neutron-qos
     # Octavia
     ENABLED_SERVICES+=,octavia,o-api,o-cw,o-hm,o-hk,o-da
diff --git a/pkg/cloud/services/networking/trunk.go b/pkg/cloud/services/networking/trunk.go
@@ -95,6 +95,9 @@ func (s *Service) DeleteTrunk(eventObject runtime.Object, portID string) error {
 				record.Eventf(eventObject, "SuccessfulDeleteTrunk", "Trunk %s with id %s did not exist", trunkInfo[0].Name, trunkInfo[0].ID)
 				return true, nil
 			}
+			if capoerrors.IsConflict(err) {
+				return false, nil
+			}
 			if capoerrors.IsRetryable(err) {
 				return false, nil
 			}

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,9 @@ func (s *Service) DeleteTrunk(eventObject runtime.Object, portID string) error {`
`95`	`95`	`record.Eventf(eventObject, "SuccessfulDeleteTrunk", "Trunk %s with id %s did not exist", trunkInfo[0].Name, trunkInfo[0].ID)`
`96`	`96`	`return true, nil`
`97`	`97`	`}`
	`98`	`+ if capoerrors.IsConflict(err) {`
	`99`	`+ return false, nil`
	`100`	`+ }`
`98`	`101`	`if capoerrors.IsRetryable(err) {`
`99`	`102`	`return false, nil`
`100`	`103`	`}`