Merge branch 'master' into dubbo-example

moremind · Oct 16, 2023 · 21c6702 · 21c6702
2 parents ba73534 + 691f277
commit 21c6702
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...tegrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/script/build_k8s_cluster.sh b/...tegrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/script/build_k8s_cluster.sh
@@ -17,10 +17,10 @@
 #
 
 kind load docker-image "shenyu-examples-apache-dubbo-service:latest"
-          kind load docker-image "apache/shenyu-integrated-test-k8s-ingress-apache-dubbo:latest"
-          kubectl apply -f ./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
-          kubectl wait --for=condition=Ready pod -l app=shenyu-zk -n shenyu-ingress
-          kubectl apply -f ./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-examples-dubbo.yml
-          kubectl apply -f ./shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/deploy/deploy-shenyu.yaml
-          kubectl apply -f ./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/ingress.yml
+kind load docker-image "apache/shenyu-integrated-test-k8s-ingress-apache-dubbo:latest"
+kubectl apply -f ./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-zookeeper.yml
+kubectl wait --for=condition=Ready pod -l app=shenyu-zk -n shenyu-ingress
+kubectl apply -f ./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/shenyu-examples-dubbo.yml
+kubectl apply -f ./shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-apache-dubbo/deploy/deploy-shenyu.yaml
+kubectl apply -f ./shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/k8s/ingress.yml
 
diff --git a/...tegrated-test/shenyu-integrated-test-k8s-ingress-spring-cloud/script/build_k8s_cluster.sh b/...tegrated-test/shenyu-integrated-test-k8s-ingress-spring-cloud/script/build_k8s_cluster.sh
@@ -21,5 +21,6 @@ kind load docker-image "shenyu-examples-springcloud:latest"
 kind load docker-image "apache/shenyu-integrated-test-k8s-ingress-spring-cloud:latest"
 kubectl apply -f ./shenyu-integrated-test/shenyu-integrated-test-k8s-ingress-spring-cloud/deploy/deploy-shenyu.yaml
 kubectl apply -f ./shenyu-examples/shenyu-examples-eureka/k8s/shenyu-examples-eureka.yml
+kubectl wait --for=condition=Ready pod -l app=shenyu-examples-eureka-deployment -n shenyu-ingress
 kubectl apply -f ./shenyu-examples/shenyu-examples-springcloud/k8s/shenyu-examples-springcloud.yml
 kubectl apply -f ./shenyu-examples/shenyu-examples-springcloud/k8s/ingress.yml