Просмотр исходного кода

Merge pull request #2032 from porter-dev/master

Azure fix -> staging
abelanger5 4 лет назад
Родитель
Сommit
ef59fee968
2 измененных файлов с 20 добавлено и 9 удалено
  1. 1 1
      cli/cmd/preview/update_config_driver.go
  2. 19 8
      internal/kubernetes/domain/domain.go

+ 1 - 1
cli/cmd/preview/update_config_driver.go

@@ -143,7 +143,7 @@ func (d *UpdateConfigDriver) Apply(resource *models.Resource) (*models.Resource,
 	}
 
 	if shouldCreate {
-		color.New(color.FgYellow).Printf("Could not read release %s/%s (%s): attempting creation\n", d.target.Namespace, d.target.AppName, err.Error())
+		color.New(color.FgYellow).Printf("Could not read release %s/%s: attempting creation\n", d.target.Namespace, d.target.AppName)
 
 		createAgent := &deploy.CreateAgent{
 			Client: client,

+ 19 - 8
internal/kubernetes/domain/domain.go

@@ -37,15 +37,26 @@ func GetNGINXIngressServiceIP(clientset kubernetes.Interface) (string, bool, err
 		if err != nil {
 			return "", false, err
 		}
-	}
 
-	for _, svc := range svcList.Items {
-		// check that helm chart annotation is correct exists
-		if chartAnn, found := svc.ObjectMeta.Labels["helm.sh/chart"]; found {
-			if (strings.Contains(chartAnn, "ingress-nginx") || strings.Contains(chartAnn, "nginx-ingress")) && svc.Spec.Type == v1.ServiceTypeLoadBalancer {
-				nginxSvc = &svc
-				exists = true
-				break
+		if len(svcList.Items) > 0 {
+			for _, svc := range svcList.Items {
+				// check that the service is type load balancer
+				if svc.Spec.Type == v1.ServiceTypeLoadBalancer {
+					nginxSvc = &svc
+					exists = true
+					break
+				}
+			}
+		}
+	} else {
+		for _, svc := range svcList.Items {
+			// check that helm chart annotation is correct exists
+			if chartAnn, found := svc.ObjectMeta.Labels["helm.sh/chart"]; found {
+				if (strings.Contains(chartAnn, "ingress-nginx") || strings.Contains(chartAnn, "nginx-ingress")) && svc.Spec.Type == v1.ServiceTypeLoadBalancer {
+					nginxSvc = &svc
+					exists = true
+					break
+				}
 			}
 		}
 	}