Cleanup port mapping before getting a new port

traefik · May 6, 2020 · 3fb6e29 · 3fb6e29
1 parent c33ee0f
commit 3fb6e29
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/pkg/controller/service.go b/pkg/controller/service.go
@@ -104,14 +104,13 @@ func (s *ShadowServiceManager) Create(userSvc *corev1.Service) error {
 func (s *ShadowServiceManager) Update(oldUserSvc *corev1.Service, newUserSvc *corev1.Service) (*corev1.Service, error) {
 	name := s.getShadowServiceName(newUserSvc.Name, newUserSvc.Namespace)
 
-	ports, err := s.getShadowServicePorts(newUserSvc)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get ports for service %s/%s: %w", newUserSvc.Namespace, newUserSvc.Name, err)
+	if err := s.cleanupPortMapping(oldUserSvc, newUserSvc); err != nil {
+		return nil, fmt.Errorf("unable to cleanup port mapping for service %s/%s: %w", oldUserSvc.Namespace, oldUserSvc.Name, err)
 	}
 
-	err = s.cleanupPortMapping(oldUserSvc, newUserSvc)
+	ports, err := s.getShadowServicePorts(newUserSvc)
 	if err != nil {
-		return nil, fmt.Errorf("unable to cleanup port mapping for service %s/%s: %w", oldUserSvc.Namespace, oldUserSvc.Name, err)
+		return nil, fmt.Errorf("unable to get ports for service %s/%s: %w", newUserSvc.Namespace, newUserSvc.Name, err)
 	}
 
 	var updatedSvc *corev1.Service