Skip to content

Commit ec23a4c

Browse files
Automator: update common-files@master in istio/api@master (#2008)
1 parent aadf1ba commit ec23a4c

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a20f94f052259a063e3fb07d88a61ec6e8ba707c
1+
7012b0fa6ff9258adf969aba44c06091858e2f26

common/scripts/kind_provisioner.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ EOF
155155
fi
156156

157157
# Create KinD cluster
158-
if ! (kind create cluster --name="${NAME}" --config "${CONFIG}" -v9 --retain --image "${IMAGE}" --wait=60s); then
158+
if ! (kind create cluster --name="${NAME}" --config "${CONFIG}" -v9 --retain --image "${IMAGE}" --wait=180s); then
159159
echo "Could not setup KinD environment. Something wrong with KinD setup. Exporting logs."
160160
exit 1
161161
fi
@@ -230,6 +230,15 @@ EOF
230230
CONTAINER_IP=$(docker inspect "${CLUSTER_NAME}-control-plane" --format "{{ .NetworkSettings.Networks.kind.IPAddress }}")
231231
kind get kubeconfig --name "${CLUSTER_NAME}" --internal | \
232232
sed "s/${CLUSTER_NAME}-control-plane/${CONTAINER_IP}/g" > "${CLUSTER_KUBECONFIG}"
233+
if [ ! -s "${CLUSTER_KUBECONFIG}" ]; then
234+
# TODO(https://github.com/istio/istio/issues/33096) remove this retry
235+
echo "FAIL: unable to get kubeconfig on first try, trying again"
236+
sleep 10
237+
# Output for debugging
238+
kind get kubeconfig --name "${CLUSTER_NAME}" --internal
239+
kind get kubeconfig --name "${CLUSTER_NAME}" --internal | \
240+
sed "s/${CLUSTER_NAME}-control-plane/${CONTAINER_IP}/g" > "${CLUSTER_KUBECONFIG}"
241+
fi
233242

234243
# Enable core dumps
235244
docker exec "${CLUSTER_NAME}"-control-plane bash -c "sysctl -w kernel.core_pattern=/var/lib/istio/data/core.proxy && ulimit -c unlimited"

0 commit comments

Comments
 (0)