Skip to content

Commit a846f3d

Browse files
Automator: update common-files@master in istio/api@master (#3422)
1 parent 01e4b94 commit a846f3d

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0534ded1b742f889f515f2c651122889c382aac4
1+
c036aefdb6470b76bfc1476beb092ec23dea50cd

common/scripts/kind_provisioner.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,16 @@ function setup_kind_cluster() {
190190
kind create cluster --name="${NAME}" -v4 --retain --image "${IMAGE}" ${KIND_WAIT_FLAG:+"$KIND_WAIT_FLAG"} --config -); then
191191
echo "Could not setup KinD environment. Something wrong with KinD setup. Exporting logs."
192192
return 9
193+
# kubectl config set clusters.kind-istio-testing.server https://istio-testing-control-plane:6443
193194
fi
195+
196+
if [[ "${DEVCONTAINER}" ]]; then
197+
# identify our docker container id using proc and regex
198+
containerid=$(grep 'resolv.conf' /proc/self/mountinfo | sed 's/.*\/docker\/containers\/\([0-9a-f]*\).*/\1/')
199+
docker network connect kind "$containerid"
200+
kind export kubeconfig --name="${NAME}" --internal
201+
fi
202+
194203
# Workaround kind issue causing taints to not be removed in 1.24
195204
kubectl taint nodes "${NAME}"-control-plane node-role.kubernetes.io/control-plane- 2>/dev/null || true
196205

0 commit comments

Comments
 (0)