Update installation scripts

Signed-off-by: nshankar <[email protected]>
istio · Aug 9, 2024 · f1e6b4d · f1e6b4d
1 parent 01b75e9
commit f1e6b4d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/content/en/docs/setup/install/multicluster/multi-primary/helm_test.sh b/content/en/docs/setup/install/multicluster/multi-primary/helm_test.sh
@@ -35,13 +35,13 @@ function install_istio_helm {
 function install_istio_on_cluster1_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"
     snip_configure_cluster1_as_a_primary_3
-    echo y | snip_configure_cluster1_as_a_primary_4
+    snip_configure_cluster1_as_a_primary_4
 }
 
 function install_istio_on_cluster2_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER2}"
     snip_configure_cluster2_as_a_primary_3
-    echo y | snip_configure_cluster2_as_a_primary_4
+    snip_configure_cluster2_as_a_primary_4
 }
 
 function enable_endpoint_discovery {

diff --git a/content/en/docs/setup/install/multicluster/multi-primary_multi-network/helm_test.sh b/content/en/docs/setup/install/multicluster/multi-primary_multi-network/helm_test.sh
@@ -30,7 +30,7 @@ function install_istio_on_cluster1_helm {
     snip_set_the_default_network_for_cluster1_1
 
     snip_configure_cluster1_as_a_primary_3
-    echo y | snip_configure_cluster1_as_a_primary_4
+    snip_configure_cluster1_as_a_primary_4
 
     echo "Creating the east-west gateway"
     snip_install_the_eastwest_gateway_in_cluster1_2
@@ -48,7 +48,7 @@ function install_istio_on_cluster2_helm {
     snip_set_the_default_network_for_cluster2_1
 
     snip_configure_cluster2_as_a_primary_3
-    echo y | snip_configure_cluster2_as_a_primary_4
+    snip_configure_cluster2_as_a_primary_4
 
     echo "Creating the east-west gateway"
     snip_install_the_eastwest_gateway_in_cluster2_3

diff --git a/content/en/docs/setup/install/multicluster/primary-remote/helm_test.sh b/content/en/docs/setup/install/multicluster/primary-remote/helm_test.sh
@@ -27,7 +27,7 @@ set_single_network_vars
 function install_istio_on_cluster1_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"
     snip_configure_cluster1_as_a_primary_3
-    echo y | snip_configure_cluster1_as_a_primary_4
+    snip_configure_cluster1_as_a_primary_4
 
     echo "Creating the east-west gateway"
     snip_install_the_eastwest_gateway_in_cluster1_2

diff --git a/content/en/docs/setup/install/multicluster/primary-remote_multi-network/helm_test.sh b/content/en/docs/setup/install/multicluster/primary-remote_multi-network/helm_test.sh
@@ -26,8 +26,8 @@ set_multi_network_vars
 
 function install_istio_on_cluster1_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"
-    snip_configure_cluster1_as_a_primary_1
-    echo y | snip_configure_cluster1_as_a_primary_2
+    snip_configure_cluster1_as_a_primary_3
+    snip_configure_cluster1_as_a_primary_4
 
     echo "Creating the east-west gateway"
     snip_install_the_eastwest_gateway_in_cluster1_2

diff --git a/go.mod b/go.mod
@@ -11,8 +11,11 @@ exclude k8s.io/kubernetes v1.13.0
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
 
 require (
+	github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
 	golang.org/x/sync v0.7.0
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117
+	google.golang.org/grpc v1.65.0
 	istio.io/istio v0.0.0-20240802232721-749dbacd692e
 	k8s.io/apimachinery v0.30.1
 	k8s.io/client-go v0.30.1
@@ -46,7 +49,6 @@ require (
 	github.com/docker/docker v26.1.4+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
-	github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -185,8 +187,6 @@ require (
 	golang.org/x/tools v0.22.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
-	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect