Skip to content

Commit 819b0fc

Browse files
committed
Update helm repo setup scripts
Signed-off-by: nshankar <[email protected]>
1 parent 7123aa0 commit 819b0fc

File tree

6 files changed

+42
-4
lines changed

6 files changed

+42
-4
lines changed

content/en/docs/setup/install/multicluster/common.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,35 @@ function verify_load_balancing
144144
_verify_contains snip_verifying_crosscluster_traffic_3 "$EXPECTED_RESPONSE_FROM_CLUSTER1"
145145
_verify_contains snip_verifying_crosscluster_traffic_3 "$EXPECTED_RESPONSE_FROM_CLUSTER2"
146146
}
147+
148+
# For Helm multi-cluster installation steps
149+
150+
function create_istio_system_ns
151+
{
152+
snip_create_istio_system_namespace_cluster_1
153+
snip_create_istio_system_namespace_cluster_1
154+
}
155+
156+
function setup_helm_repo
157+
{
158+
snip_setup_helm_repo_cluster_1
159+
snip_setup_helm_repo_cluster_2
160+
}
161+
162+
snip_create_istio_system_namespace_cluster_1() {
163+
kubectl create namespace istio-system --kube-context ${CTX_CLUSTER1}
164+
}
165+
166+
snip_create_istio_system_namespace_cluster_2() {
167+
kubectl create namespace istio-system --kube-context ${CTX_CLUSTER2}
168+
}
169+
170+
snip_setup_helm_repo_cluster_1() {
171+
helm repo add istio https://istio-release.storage.googleapis.com/charts --kube-context ${CTX_CLUSTER1}
172+
helm repo update --kube-context ${CTX_CLUSTER1}
173+
}
174+
175+
snip_setup_helm_repo_cluster_2() {
176+
helm repo add istio https://istio-release.storage.googleapis.com/charts --kube-context ${CTX_CLUSTER2}
177+
helm repo update --kube-context ${CTX_CLUSTER2}
178+
}

content/en/docs/setup/install/multicluster/multi-primary/helm_test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ set -o pipefail
2323

2424
source content/en/docs/setup/install/multicluster/common.sh
2525
set_single_network_vars
26+
setup_helm_repo
2627

2728
function install_istio_helm {
2829
# Install Istio on the 2 clusters. Executing in

content/en/docs/setup/install/multicluster/multi-primary_multi-network/helm_test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ set -o pipefail
2323

2424
source content/en/docs/setup/install/multicluster/common.sh
2525
set_multi_network_vars
26+
setup_helm_repo
2627

2728
function install_istio_on_cluster1_helm {
2829
echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"

content/en/docs/setup/install/multicluster/primary-remote/helm_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ set -o pipefail
2323

2424
source content/en/docs/setup/install/multicluster/common.sh
2525
set_single_network_vars
26+
setup_helm_repo
27+
create_istio_system_ns
2628

2729
function install_istio_on_cluster1_helm {
2830
echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"

content/en/docs/setup/install/multicluster/primary-remote_multi-network/helm_test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ set -o pipefail
2323

2424
source content/en/docs/setup/install/multicluster/common.sh
2525
set_multi_network_vars
26+
setup_helm_repo
27+
create_istio_system_ns
2628

2729
function install_istio_on_cluster1_helm {
2830
echo "Installing Istio on Primary cluster: ${CTX_CLUSTER1}"

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ exclude k8s.io/kubernetes v1.13.0
1111
replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
1212

1313
require (
14+
github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28
1415
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
1516
golang.org/x/sync v0.7.0
17+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117
18+
google.golang.org/grpc v1.65.0
1619
istio.io/istio v0.0.0-20240802232721-749dbacd692e
1720
k8s.io/apimachinery v0.30.1
1821
k8s.io/client-go v0.30.1
@@ -46,7 +49,6 @@ require (
4649
github.com/docker/docker v26.1.4+incompatible // indirect
4750
github.com/docker/docker-credential-helpers v0.8.1 // indirect
4851
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
49-
github.com/envoyproxy/go-control-plane v0.12.1-0.20240716023226-bc563f4e9b28 // indirect
5052
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
5153
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
5254
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
@@ -185,8 +187,6 @@ require (
185187
golang.org/x/tools v0.22.0 // indirect
186188
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
187189
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
188-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
189-
google.golang.org/grpc v1.65.0 // indirect
190190
google.golang.org/protobuf v1.34.1 // indirect
191191
gopkg.in/inf.v0 v0.9.1 // indirect
192192
gopkg.in/ini.v1 v1.67.0 // indirect
@@ -213,4 +213,4 @@ require (
213213
sigs.k8s.io/mcs-api v0.1.0 // indirect
214214
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
215215
sigs.k8s.io/yaml v1.4.0 // indirect
216-
)
216+
)

0 commit comments

Comments
 (0)