istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automator: update common-files@master in istio/istio.io@master (#8812)

This commit is contained in:
Istio Automation 2021-01-20 16:10:53 -08:00 committed by GitHub
parent 81a017eea5
commit 1bf9d85886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/.commonfiles.sha
View File

@ -1 +1 @@
fb0fb264f867b1886df67d631d173035576dc6c5 edf60422355b94b59e397b0edc3cf06994491698

10
common/scripts/kind_provisioner.sh
View File

@ -62,21 +62,23 @@ function load_cluster_topology() {
export CLUSTER_SVC_SUBNETS export CLUSTER_SVC_SUBNETS
export CLUSTER_NETWORK_ID export CLUSTER_NETWORK_ID
KUBE_CLUSTERS=$(jq '.[] | select(.kind == "Kubernetes" or .kind == null)')
while read -r value; do while read -r value; do
CLUSTER_NAMES+=("$value") CLUSTER_NAMES+=("$value")
done < <(jq -r '.[].cluster_name' "${CLUSTER_TOPOLOGY_CONFIG_FILE}") done < <(echo "${KUBE_CLUSTERS}" | jq -r '.cluster_name // .clusterName')
while read -r value; do while read -r value; do
CLUSTER_POD_SUBNETS+=("$value") CLUSTER_POD_SUBNETS+=("$value")
done < <(jq -r '.[].pod_subnet' "${CLUSTER_TOPOLOGY_CONFIG_FILE}") done < <(echo "${KUBE_CLUSTERS}" | jq -r '.pod_subnet // .podSubnet')
while read -r value; do while read -r value; do
CLUSTER_SVC_SUBNETS+=("$value") CLUSTER_SVC_SUBNETS+=("$value")
done < <(jq -r '.[].svc_subnet' "${CLUSTER_TOPOLOGY_CONFIG_FILE}") done < <(echo "${KUBE_CLUSTERS}" | jq -r '.svc_subnet // .svcSubnet')
while read -r value; do while read -r value; do
CLUSTER_NETWORK_ID+=("$value") CLUSTER_NETWORK_ID+=("$value")
done < <(jq -r '.[].network_id' "${CLUSTER_TOPOLOGY_CONFIG_FILE}") done < <(echo "${KUBE_CLUSTERS}" | jq -r '.[].network_id // .network')
export NUM_CLUSTERS export NUM_CLUSTERS
NUM_CLUSTERS=$(jq 'length' "${CLUSTER_TOPOLOGY_CONFIG_FILE}") NUM_CLUSTERS=$(jq 'length' "${CLUSTER_TOPOLOGY_CONFIG_FILE}")