Skip to content

Commit b361c17

Browse files
committed
Remove the ttl flag from sshuttle invocation
The --ttl flag has been removed from the latest version of sshuttle. Previously, this was required to override the default TTL that sshuttle sets of 63, so that packets from Prow / kind pods weren't ignored. However, in the latest version of sshuttle, the TTL of packets leaving the sshuttle server are no longer adjusted, so let's try without this option.
1 parent 010f0b9 commit b361c17

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

hack/ci/devstack-on-aws-project-install.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ main() {
139139
# Install some local dependencies we later need in the meantime (we have to wait for cloud init anyway)
140140
if ! command -v sshuttle;
141141
then
142-
# Install sshuttle from source because we need: https://github.com/sshuttle/sshuttle/pull/606
142+
# Install sshuttle from source because we need: https://github.com/sshuttle/sshuttle/pull/661
143143
# TODO(sbueringer) install via pip after the next release after 1.0.5 via:
144144
# pip3 install sshuttle
145145
cd /tmp
@@ -169,9 +169,7 @@ main() {
169169

170170
# Open tunnel
171171
echo "Opening tunnel to ${PRIVATE_IP} via ${PUBLIC_IP}"
172-
# Packets from the Prow Pod or the Pods in Kind have TTL 63 or 64.
173-
# We need a ttl of 65 (default 63), so all of our packets are captured by sshuttle.
174-
sshuttle -r "ubuntu@${PUBLIC_IP}" "${PRIVATE_IP}/32" 172.24.4.0/24 --ttl=65 --ssh-cmd='ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile=/dev/null"' -l 0.0.0.0 -D
172+
sshuttle -r "ubuntu@${PUBLIC_IP}" "${PRIVATE_IP}/32" 172.24.4.0/24 --ssh-cmd='ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile=/dev/null"' -l 0.0.0.0 -D
175173

176174
export OS_REGION_NAME=RegionOne
177175
export OS_PROJECT_DOMAIN_ID=default

hack/ci/devstack-on-gce-project-install.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ main() {
160160
# Install some local dependencies we later need in the meantime (we have to wait for cloud init anyway)
161161
if ! command -v sshuttle;
162162
then
163-
# Install sshuttle from source because we need: https://github.com/sshuttle/sshuttle/pull/606
163+
# Install sshuttle from source because we need: https://github.com/sshuttle/sshuttle/pull/661
164164
# TODO(sbueringer) install via pip after the next release after 1.0.5 via:
165165
# pip3 install sshuttle
166166
cd /tmp
@@ -187,9 +187,7 @@ main() {
187187

188188
# Open tunnel
189189
echo "Opening tunnel to ${PRIVATE_IP} via ${PUBLIC_IP}"
190-
# Packets from the Prow Pod or the Pods in Kind have TTL 63 or 64.
191-
# We need a ttl of 65 (default 63), so all of our packets are captured by sshuttle.
192-
sshuttle -r "${PUBLIC_IP}" "${PRIVATE_IP}/32" 172.24.4.0/24 --ttl=65 --ssh-cmd='ssh -i ~/.ssh/google_compute_engine -o "StrictHostKeyChecking no" -o "UserKnownHostsFile=/dev/null" -o "IdentitiesOnly=yes"' -l 0.0.0.0 -D
190+
sshuttle -r "${PUBLIC_IP}" "${PRIVATE_IP}/32" 172.24.4.0/24 --ssh-cmd='ssh -i ~/.ssh/google_compute_engine -o "StrictHostKeyChecking no" -o "UserKnownHostsFile=/dev/null" -o "IdentitiesOnly=yes"' -l 0.0.0.0 -D
193191

194192
export OS_REGION_NAME=RegionOne
195193
export OS_PROJECT_DOMAIN_ID=default

0 commit comments

Comments
 (0)