provision/kubernetes: fix merge services when service does not exist

tsuru · Nov 16, 2018 · 81688fb · 81688fb
1 parent 82be8e5
commit 81688fb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/provision/kubernetes/deploy.go b/provision/kubernetes/deploy.go
@@ -1032,12 +1032,12 @@ func (m *serviceManager) DeployService(ctx context.Context, a provision.App, pro
 
 func mergeServices(client *ClusterClient, svc *apiv1.Service) (*apiv1.Service, bool, error) {
 	existing, err := client.CoreV1().Services(svc.Namespace).Get(svc.Name, metav1.GetOptions{})
-	if err != nil && !k8sErrors.IsNotFound(err) {
+	if err != nil {
+		if k8sErrors.IsNotFound(err) {
+			return svc, true, nil
+		}
 		return nil, false, errors.WithStack(err)
 	}
-	if existing == nil {
-		return svc, true, nil
-	}
 	for i := 0; i < len(svc.Spec.Ports) && i < len(existing.Spec.Ports); i++ {
 		svc.Spec.Ports[i].NodePort = existing.Spec.Ports[i].NodePort
 	}