Update helm repo setup scripts

Signed-off-by: nshankar <[email protected]>
istio · Aug 14, 2024 · 819b0fc · 819b0fc
1 parent 7123aa0
commit 819b0fc
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/content/en/docs/setup/install/multicluster/common.sh b/content/en/docs/setup/install/multicluster/common.sh
@@ -144,3 +144,35 @@ function verify_load_balancing
   _verify_contains snip_verifying_crosscluster_traffic_3 "$EXPECTED_RESPONSE_FROM_CLUSTER1"
   _verify_contains snip_verifying_crosscluster_traffic_3 "$EXPECTED_RESPONSE_FROM_CLUSTER2"
 }
+
+# For Helm multi-cluster installation steps
+
+function create_istio_system_ns
+{
+  snip_create_istio_system_namespace_cluster_1
+  snip_create_istio_system_namespace_cluster_1
+}
+
+function setup_helm_repo
+{
+  snip_setup_helm_repo_cluster_1
+  snip_setup_helm_repo_cluster_2
+}
+
+snip_create_istio_system_namespace_cluster_1() {
+kubectl create namespace istio-system --kube-context ${CTX_CLUSTER1}
+}
+
+snip_create_istio_system_namespace_cluster_2() {
+kubectl create namespace istio-system --kube-context ${CTX_CLUSTER2}
+}
+
+snip_setup_helm_repo_cluster_1() {
+helm repo add istio https://istio-release.storage.googleapis.com/charts --kube-context ${CTX_CLUSTER1}
+helm repo update --kube-context ${CTX_CLUSTER1}
+}
+
+snip_setup_helm_repo_cluster_2() {
+helm repo add istio https://istio-release.storage.googleapis.com/charts --kube-context ${CTX_CLUSTER2}
+helm repo update --kube-context ${CTX_CLUSTER2}
+}
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
@@ -23,6 +23,7 @@ set -o pipefail
 
 source content/en/docs/setup/install/multicluster/common.sh
 set_single_network_vars
+setup_helm_repo
 
 function install_istio_helm {
   # Install Istio on the 2 clusters. Executing in

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
@@ -23,6 +23,7 @@ set -o pipefail
 
 source content/en/docs/setup/install/multicluster/common.sh
 set_multi_network_vars
+setup_helm_repo
 
 function install_istio_on_cluster1_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"

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
@@ -23,6 +23,8 @@ set -o pipefail
 
 source content/en/docs/setup/install/multicluster/common.sh
 set_single_network_vars
+setup_helm_repo
+create_istio_system_ns
 
 function install_istio_on_cluster1_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"

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
@@ -23,6 +23,8 @@ set -o pipefail
 
 source content/en/docs/setup/install/multicluster/common.sh
 set_multi_network_vars
+setup_helm_repo
+create_istio_system_ns
 
 function install_istio_on_cluster1_helm {
     echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"

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
@@ -213,4 +213,4 @@ require (
 	sigs.k8s.io/mcs-api v0.1.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
-)
+)