Skip to content

Commit 329385c

Browse files
committed
wip: disable IPv6 by default on workspaces nodes
1 parent 2a5da84 commit 329385c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

components/docker-up/docker-up/main.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,13 @@ func runWithinNetns() (err error) {
132132
args = append(args, fmt.Sprintf("--mtu=%v", netIface.Attrs().MTU))
133133
// configure docker0 MTU (used as control plane, not related to containers)
134134
args = append(args, fmt.Sprintf("--network-control-plane-mtu=%v", netIface.Attrs().MTU))
135+
// configure docker0 MTU (used as control plane, not related to containers)
136+
137+
args = append(args, "--ip6tables=false")
138+
//args = append(args, "--default-network-opt=bridge=com.docker.network.enable_ipv6=true")
135139

136-
// cmp. ENT-324: Required to run dockerd >= 26.1 in a Gitpod workspace
137-
os.Setenv("DOCKER_ALLOW_IPV6_ON_IPV4_INTERFACE", "1")
140+
// // cmp. ENT-324: Required to run dockerd >= 26.1 in a Gitpod workspace
141+
// os.Setenv("DOCKER_ALLOW_IPV6_ON_IPV4_INTERFACE", "1")
138142

139143
if listenFDs > 0 {
140144

install/installer/pkg/components/ws-daemon/daemonset.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ func daemonset(ctx *common.RenderContext) ([]runtime.Object, error) {
5757
sysctl -w "net.ipv4.tcp_tw_reuse=1" &&
5858
sysctl -w fs.inotify.max_user_watches=1000000 &&
5959
sysctl -w "kernel.dmesg_restrict=1" &&
60-
sysctl -w vm.unprivileged_userfaultfd=0
60+
sysctl -w vm.unprivileged_userfaultfd=0 &&
61+
sysctl -w net.ipv6.conf.default.disable_ipv6=1
6162
) && echo "done!" || echo "failed!"
6263
`,
6364
},

0 commit comments

Comments
 (0)