rename dummy device

Signed-off-by: walnuts1018 <[email protected]>
cybozu-go · Aug 27, 2024 · 90f4c9f · 90f4c9f
1 parent 2040975
commit 90f4c9f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/config/samples/nat-client.yaml b/config/samples/nat-client.yaml
@@ -22,5 +22,7 @@ spec:
       - name: nat-client
         image: ghcr.io/cybozu/ubuntu-debug:22.04
         command: ["sleep"]
+        securityContext:
+          privileged: true
         args:
           - infinity
diff --git a/dockerfiles/Dockerfile.egress-controller b/dockerfiles/Dockerfile.egress-controller
@@ -16,7 +16,8 @@ COPY cmd/egress-controller/main.go cmd/egress-controller/main.go
 COPY api/ api/
 COPY internal/ internal/
 
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o egress-controller cmd/egress-controller/main.go
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o egress-controller cmd/egress-controller/main.go
 
 FROM ghcr.io/cybozu/ubuntu:22.04
 WORKDIR /

diff --git a/dockerfiles/Dockerfile.nat-gateway b/dockerfiles/Dockerfile.nat-gateway
@@ -16,11 +16,14 @@ COPY cmd/nat-gateway/main.go cmd/nat-gateway/main.go
 COPY api/ api/
 COPY internal/ internal/
 
-RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o nat-gateway cmd/nat-gateway/main.go
+RUN --mount=type=cache,target=/go/pkg/mod/ \
+    CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o nat-gateway cmd/nat-gateway/main.go
 
 FROM ghcr.io/cybozu/ubuntu:22.04
 WORKDIR /
-RUN apt-get -yy update && apt-get install -yy netbase kmod iptables iproute2
+RUN --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    apt-get -yy update && apt-get install -yy netbase kmod iptables iproute2
 
 COPY --from=builder /workspace/nat-gateway .
 USER 0:0

diff --git a/internal/fou/fou.go b/internal/fou/fou.go
@@ -139,8 +139,11 @@ func (t *FouTunnelController) Init() error {
 
 	attrs := netlink.NewLinkAttrs()
 	attrs.Name = fouDummy
-	return netlink.LinkAdd(&netlink.Dummy{LinkAttrs: attrs})
 
+	if err := netlink.LinkAdd(&netlink.Dummy{LinkAttrs: attrs}); err != nil {
+		return fmt.Errorf("failed to add dummy device: %w", err)
+	}
+	return nil
 }
 
 func (t *FouTunnelController) initIPTables(p iptables.Protocol) error {

diff --git a/internal/nat/nat.go b/internal/nat/nat.go
@@ -15,7 +15,7 @@ const (
 	egressProtocolID = 30
 	egressRulePrio   = 2000
 
-	egressDummy = "pona-egress-dummy"
+	egressDummy = "nat-dummy"
 )
 
 type Controller interface {
@@ -100,7 +100,11 @@ func (c *controller) Init() error {
 
 	attrs := netlink.NewLinkAttrs()
 	attrs.Name = egressDummy
-	return netlink.LinkAdd(&netlink.Dummy{LinkAttrs: attrs})
+
+	if err := netlink.LinkAdd(&netlink.Dummy{LinkAttrs: attrs}); err != nil {
+		return fmt.Errorf("failed to add dummy device: %w", err)
+	}
+	return nil
 }
 
 func (c *controller) AddClient(addr netip.Addr, link netlink.Link) error {