Skip to content

Commit 3d2cc79

Browse files
jpayne3506krunaljain
authored andcommitted
chore: healthy script state
1 parent 1971897 commit 3d2cc79

File tree

2 files changed

+34
-44
lines changed

2 files changed

+34
-44
lines changed

hack/scripts/cil-script.sh

Lines changed: 3 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,7 @@ for unique in $sufixes; do
2323
--set azure.resourceGroup=${clusterPrefix}-${unique}-rg --set cluster.id=${unique} \
2424
--set ipam.operator.clusterPoolIPv4PodCIDRList='{192.'${unique}'0.0.0/16}' \
2525
--set hubble.enabled=false \
26-
--set envoy.enabled=false \
27-
--set ipv4NativeRoutingCIDR=10.0.0.0/8 \
28-
--set ipam.mode="delegated-plugin" \
29-
--set extraArgs[0]="--local-router-ipv4=169.254.23.0" \
30-
--set tunnel="disabled" \
31-
--set routingMode=native \
32-
--set endpointRoutes.enabled=true \
33-
--set endpointHealthChecking.enabled=false
26+
--set envoy.enabled=false
3427

3528
else # Ignore this block for now, was testing internal resources.
3629
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
@@ -82,48 +75,14 @@ az network vnet peering create \
8275
--remote-vnet "${VNET_ID1}" \
8376
--allow-vnet-access
8477

85-
# Retaining for testing
86-
# cilium install -n kube-system cilium cilium/cilium --version v1.16.1 --set azure.resourceGroup=${clusterPrefix}-${unique} \
87-
# --set cluster.id=${unique} --set ipam.operator.clusterPoolIPv4PodCIDRList='{10.'${unique}'0.0.0/16}' \
88-
# --set ipam.mode="delegated-plugin" \
89-
# --set hubble.enabled=false \
90-
# --set local-router-ipv4="169.254.23.0" \
91-
# --set enable-l7-proxy=false \
92-
# --set routing-mode="tunnel" \
93-
# --set cni-exclusive=false \
94-
# --set enable-tcx=false \
95-
# --set kube-proxy-replacement-healthz-bind-address="0.0.0.0:10256"
96-
97-
98-
# cilium clustermesh enable --context ${clusterPrefix}-${sufix1} --enable-kvstoremesh=false
99-
# cilium clustermesh enable --context ${clusterPrefix}-${sufix2} --enable-kvstoremesh=false
100-
# -- testing --
78+
10179
cilium clustermesh enable --context ${clusterPrefix}-${sufix1} --enable-kvstoremesh=true
10280
cilium clustermesh enable --context ${clusterPrefix}-${sufix2} --enable-kvstoremesh=true
103-
# # -- testing --
81+
10482

10583
cilium clustermesh status --context ${clusterPrefix}-${sufix1} --wait
10684
cilium clustermesh status --context ${clusterPrefix}-${sufix2} --wait
10785

10886
# # CA is passed between clusters in this step
10987
cilium clustermesh connect --context ${clusterPrefix}-${sufix1} --destination-context ${clusterPrefix}-${sufix2}
11088
# These can be run in parallel in different bash shells
111-
# Running connectivity test from context to multi. test-namespace shows the direction of the test. 1->2, 2->1.
112-
# Completeing both of these will take 20+~minutes. Run outside of script.
113-
cilium connectivity test --context ${clusterPrefix}-${sufix1} --multi-cluster ${clusterPrefix}-${sufix2} --test-namespace ciltest-${sufix1}-${sufix2} --force-deploy
114-
cilium connectivity test --context ${clusterPrefix}-${sufix2} --multi-cluster ${clusterPrefix}-${sufix1} --test-namespace ciltest-${sufix2}-${sufix1} --force-deploy
115-
116-
cilium config set --context ${clusterPrefix}-${sufix1} cluster.name ${clusterPrefix}-${sufix1}
117-
cilium config set --context ${clusterPrefix}-${sufix1} cluster.id ${sufix1}
118-
cilium config set --context ${clusterPrefix}-${sufix2} cluster.name ${clusterPrefix}-${sufix2}
119-
cilium config set --context ${clusterPrefix}-${sufix2} cluster.id ${sufix2}
120-
121-
# -- Useful debug commands --
122-
# cilium status --context ${clusterPrefix}-${sufix1}
123-
# cilium status --context ${clusterPrefix}-${sufix2}
124-
125-
# az aks get-credentials --resource-group ${clusterPrefix}-${sufix1} --name ${clusterPrefix}-${sufix1} --overwrite-existing
126-
# az aks get-credentials --resource-group ${clusterPrefix}-${sufix2} --name ${clusterPrefix}-${sufix2} --overwrite-existing
127-
128-
# cilium clustermesh disable --context ${clusterPrefix}-${sufix1}
129-
# cilium clustermesh disable --context ${clusterPrefix}-${sufix2}

hack/scripts/cli-script-notes.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
clusterPrefix=jpayne sufix1=1 sufix2=2 SUB=d9eabe18-12f6-4421-934a-d7e2327585f5 clusterType=overlay-byocni-nokubeproxy-up-mesh ./cil-script.sh
2+
3+
4+
# Running connectivity test from context to multi. test-namespace shows the direction of the test. 1->2, 2->1.
5+
# Completeing both of these will take 20+~minutes. Run outside of script.
6+
cilium connectivity test --context ${clusterPrefix}-${sufix1} --multi-cluster ${clusterPrefix}-${sufix2} --test-namespace ciltest-${sufix1}-${sufix2} --force-deploy
7+
cilium connectivity test --context ${clusterPrefix}-${sufix2} --multi-cluster ${clusterPrefix}-${sufix1} --test-namespace ciltest-${sufix2}-${sufix1} --force-deploy
8+
9+
cilium config set --context ${clusterPrefix}-${sufix1} cluster.name ${clusterPrefix}-${sufix1}
10+
cilium config set --context ${clusterPrefix}-${sufix1} cluster.id ${sufix1}
11+
cilium config set --context ${clusterPrefix}-${sufix2} cluster.name ${clusterPrefix}-${sufix2}
12+
cilium config set --context ${clusterPrefix}-${sufix2} cluster.id ${sufix2}
13+
14+
# -- Useful debug commands --
15+
# cilium status --context ${clusterPrefix}-${sufix1}
16+
# cilium status --context ${clusterPrefix}-${sufix2}
17+
18+
# az aks get-credentials --resource-group ${clusterPrefix}-${sufix1} --name ${clusterPrefix}-${sufix1} --overwrite-existing
19+
# az aks get-credentials --resource-group ${clusterPrefix}-${sufix2} --name ${clusterPrefix}-${sufix2} --overwrite-existing
20+
21+
# cilium clustermesh disable --context ${clusterPrefix}-${sufix1}
22+
# cilium clustermesh disable --context ${clusterPrefix}-${sufix2}
23+
24+
# Below is old helm values to get helm to operate with different values, no longer needed, but kept
25+
--set ipv4NativeRoutingCIDR=10.0.0.0/8 \
26+
--set ipam.mode="delegated-plugin" \
27+
--set extraArgs[0]="--local-router-ipv4=169.254.23.0" \
28+
--set tunnel="disabled" \
29+
--set routingMode=native \
30+
--set endpointRoutes.enabled=true \
31+
--set endpointHealthChecking.enabled=false

0 commit comments

Comments
 (0)