only install istiod when kmesh run e2e test

Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>

Author: LiZhenCheng9527

test/e2e/baseline_test.go

@@ -754,27 +754,27 @@ func TestBookinfo(t *testing.T) {
 	framework.NewTest(t).Run(func(t framework.TestContext) {
 		namespace := apps.Namespace.Name()
 		// Install bookinfo.
-		if _, err := shell.Execute(true, fmt.Sprintf("kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.22/samples/bookinfo/platform/kube/bookinfo.yaml -n %s", namespace)); err != nil {
+		if _, err := shell.Execute(true, fmt.Sprintf("kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/bookinfo/platform/kube/bookinfo.yaml -n %s", namespace)); err != nil {
 			t.Fatalf("failed to install bookinfo: %v", err)
 		}
 		t.Cleanup(func() {
-			if _, err := shell.Execute(true, fmt.Sprintf("kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.22/samples/bookinfo/platform/kube/bookinfo.yaml -n %s", namespace)); err != nil {
+			if _, err := shell.Execute(true, fmt.Sprintf("kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/bookinfo/platform/kube/bookinfo.yaml -n %s", namespace)); err != nil {
 				t.Fatalf("failed to delete bookinfo: %v", err)
 			}
 		})
 
 		// Install sleep as client.
-		if _, err := shell.Execute(true, fmt.Sprintf("kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.22/samples/sleep/sleep.yaml -n %s", namespace)); err != nil {
+		if _, err := shell.Execute(true, fmt.Sprintf("kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/sleep/sleep.yaml -n %s", namespace)); err != nil {
 			t.Fatalf("failed to install sleep as client of bookinfo: %v", err)
 		}
 		t.Cleanup(func() {
-			if _, err := shell.Execute(true, fmt.Sprintf("kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.22/samples/sleep/sleep.yaml -n %s", namespace)); err != nil {
+			if _, err := shell.Execute(true, fmt.Sprintf("kubectl delete -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/sleep/sleep.yaml -n %s", namespace)); err != nil {
 				t.Fatalf("failed to delete sleep as client of bookinfo: %v", err)
 			}
 		})
 
 		fetchFn := testKube.NewSinglePodFetch(t.Clusters().Default(), namespace)
-		if _, err := testKube.WaitUntilPodsAreReady(fetchFn); err != nil {
+		if _, err := testKube.WaitUntilPodsAreReady(fetchFn, retry.Timeout(15*time.Minute), retry.Delay(5*time.Second)); err != nil {
 			t.Fatalf("failed to wait bookinfo pods to be ready: %v", err)
 		}
 
@@ -797,7 +797,7 @@ func TestBookinfo(t *testing.T) {
 			return true
 		}
 
-		if err := retry.Until(checkBookinfo, retry.Timeout(600*time.Second), retry.Delay(1*time.Second)); err != nil {
+		if err := retry.Until(checkBookinfo, retry.Timeout(900*time.Second), retry.BackoffDelay(3*time.Second)); err != nil {
 			t.Fatal("failed to access bookinfo correctly: %v", err)
 		}
 
@@ -815,7 +815,7 @@ func TestBookinfo(t *testing.T) {
 			UnsetWaypoint(t, namespace, "", Namespace)
 		})
 
-		if err := retry.Until(checkBookinfo, retry.Timeout(600*time.Second), retry.Delay(1*time.Second)); err != nil {
+		if err := retry.Until(checkBookinfo, retry.Timeout(900*time.Second), retry.BackoffDelay(3*time.Second)); err != nil {
 			t.Fatal("failed to access bookinfo correctly when there is a namespace waypoint: %v", err)
 		}
 	})

test/e2e/main_test.go

@@ -370,5 +370,5 @@ func deleteWaypointProxy(ctx resource.Context, ns namespace.Instance, name strin
 		}
 
 		return nil
-	}, retry.Timeout(time.Minute*10), retry.BackoffDelay(time.Millisecond*200))
+	}, retry.Timeout(time.Minute*10), retry.BackoffDelay(time.Second*1))
 }

test/e2e/run_test.sh

@@ -105,12 +105,44 @@ data:
 EOF
 }
 
+# function setup_istio() {
+# 	echo "install istio $ISTIO_VERSION"
+# 	kubectl get crd gateways.gateway.networking.k8s.io &>/dev/null ||
+# 		{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl apply -f -; }
+
+# 	istioctl install --set profile=ambient --set meshConfig.accessLogFile="/dev/stdout" --set components.ingressGateways[0].enabled=true --set components.ingressGateways[0].name=istio-ingressgateway --skip-confirmation
+# }
+
 function setup_istio() {
 	echo "install istio $ISTIO_VERSION"
 	kubectl get crd gateways.gateway.networking.k8s.io &>/dev/null ||
 		{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl apply -f -; }
+	# install istio CRD
+	helm repo add istio https://istio-release.storage.googleapis.com/charts
+	helm repo update
+	kubectl create namespace istio-system
+	helm install istio-base istio/base -n istio-system
+
+	helm install istiod istio/istiod --namespace istio-system --version $ISTIO_VERSION --set pilot.env.PILOT_ENABLE_AMBIENT=true
+
+	while true; do
+		pod_info=$(kubectl get pods -n istio-system -l app=istiod -o jsonpath='{range .items[*]}{.metadata.name}{" "}{.status.phase}{"\n"}{end}')
+
+		if [ -z "$pod_info" ]; then
+			echo "No istiod pod found yet, waiting..."
+			sleep 1
+			continue
+		fi
+
+		read -r pod_name pod_status <<<"$pod_info"
+		if [ "$pod_status" = "Running" ]; then
+			echo "Istiod pod $pod_name is in Running state."
+			break
+		fi
 
-	istioctl install --set profile=ambient --set meshConfig.accessLogFile="/dev/stdout" --set components.ingressGateways[0].enabled=true --set components.ingressGateways[0].name=istio-ingressgateway --skip-confirmation
+		echo "Waiting for pods of Kmesh daemon to enter Running state..."
+		sleep 1
+	done
 }
 
 function setup_kmesh() {