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

Merge pull request #2028 from porter-dev/master

Azure ingress -> staging
abelanger5 4 лет назад
Родитель
Сommit
9894f1f053
1 измененных файлов с 11 добавлено и 0 удалено
  1. 11 0
      internal/kubernetes/domain/domain.go

+ 11 - 0
internal/kubernetes/domain/domain.go

@@ -28,6 +28,17 @@ func GetNGINXIngressServiceIP(clientset kubernetes.Interface) (string, bool, err
 	var nginxSvc *v1.Service
 	exists := false
 
+	// if there are no items in the list, look for alternate services/names (just Azure for now)
+	if len(svcList.Items) == 0 {
+		svcList, err = clientset.CoreV1().Services("").List(context.TODO(), metav1.ListOptions{
+			LabelSelector: "app=addon-http-application-routing-nginx-ingress",
+		})
+
+		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 {