1

Author: aledbf

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

@@ -59,7 +59,7 @@ var aptUpdated = false
 const (
 	dockerSocketFN = "/var/run/docker.sock"
 	gitpodUserId   = 33333
-	containerIf    = "eth0"
+	containerIf    = "ceth0"
 )
 
 func main() {

components/ws-daemon/nsinsider/main.go

@@ -275,7 +275,7 @@ func main() {
 					},
 				},
 				Action: func(c *cli.Context) error {
-					containerIf, vethIf, cethIf := "eth0", "veth0", "eth0"
+					containerIf, vethIf, cethIf := "eth0", "veth0", "ceth0"
 					networkCIDR := c.String("workspace-cidr")
 
 					vethIp, cethIp, mask, err := processWorkspaceCIDR(networkCIDR)
@@ -337,7 +337,7 @@ func main() {
 						Table: nat,
 						Chain: postrouting,
 						Exprs: []expr.Any{
-							&expr.Meta{Key: expr.MetaKeyIIFNAME, Register: 1},
+							&expr.Meta{Key: expr.MetaKeyOIFNAME, Register: 1},
 							&expr.Cmp{
 								Op:       expr.CmpOpEq,
 								Register: 1,
@@ -420,7 +420,7 @@ func main() {
 					},
 				},
 				Action: func(c *cli.Context) error {
-					cethIf := "eth0"
+					cethIf := "ceth0"
 
 					networkCIDR := c.String("workspace-cidr")
 					vethIp, cethIp, mask, err := processWorkspaceCIDR(networkCIDR)

install/installer/pkg/cluster/checks.go

@@ -299,7 +299,7 @@ func CheckWorkspaceCIDR(networkCIDR string) ValidationCheck {
 		Name:        "workspace CIDR is present and valid",
 		Description: "ensures the workspace CIDR contains a valid network address range",
 		Check: func(ctx context.Context, config *rest.Config, namespace string) ([]ValidationError, error) {
-			netIP, _, err := net.ParseCIDR(networkCIDR)
+			netIP, ipNet, err := net.ParseCIDR(networkCIDR)
 			if err != nil {
 				return []ValidationError{
 					{
@@ -309,6 +309,17 @@ func CheckWorkspaceCIDR(networkCIDR string) ValidationCheck {
 				}, nil
 			}
 
+			ipNet.Mask.Size()
+			mask, _ := ipNet.Mask.Size()
+			if mask > 30 {
+				return []ValidationError{
+					{
+						Message: "the workspace CIDR does not have a mask less than or equal to /30",
+						Type:    ValidationStatusError,
+					},
+				}, nil
+			}
+
 			addr, err := netip.ParseAddr(netIP.String())
 			if err != nil {
 				return []ValidationError{