Skip to content

Commit

Permalink
fix(capd): remove hack for btrfs/zfs support
Browse files Browse the repository at this point in the history
Support for btrfs/zfs was upstreamed to kind in kubernetes-sigs/kind#1464, removing the need
for us to hack support in ourselves.

Helps kubernetes-sigs#8317

chore: PR feedback

Removes the now-unused function mountDevMapper(...)

chore: fix ci lint

fix: restore missing storage consts
  • Loading branch information
cannonpalms committed Feb 1, 2024
1 parent 73cd253 commit bf54ba6
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions test/infrastructure/container/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ const (

btrfsStorage = "btrfs"
zfsStorage = "zfs"
xfsStorage = "xfs"
)

type dockerRuntime struct {
Expand Down Expand Up @@ -446,15 +445,6 @@ func (d *dockerRuntime) RunContainer(ctx context.Context, runConfig *RunContaine
}
containerConfig.Env = envVars

// handle Docker on Btrfs or ZFS
// https://github.com/kubernetes-sigs/kind/issues/1416#issuecomment-606514724
if d.mountDevMapper(info) {
runConfig.Mounts = append(runConfig.Mounts, Mount{
Source: "/dev/mapper",
Target: "/dev/mapper",
})
}

configureVolumes(runConfig, &containerConfig, &hostConfig)
configurePortMappings(runConfig.PortMappings, &containerConfig, &hostConfig)

Expand Down

0 comments on commit bf54ba6

Please sign in to comment.