Skip to content

Commit

Permalink
fix: drop /opt mount for containers/tink
Browse files Browse the repository at this point in the history
The `/opt/cni/bin` in the rootfs contains CNI binaries, which get
overwritten by the volume mount.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed Aug 22, 2024
1 parent 3c0db34 commit 5ff6cf8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion internal/integration/k8s/tink.go
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ func (suite *TinkSuite) getTinkManifests(namespace, serviceName, ssName, talosIm
},
},
xslices.Map(
constants.Overlays,
xslices.Filter(constants.Overlays, func(overlay string) bool { return overlay != "/opt" }), // /opt/cni/bin contains CNI binaries
func(mountPath string) overlayMountSpec {
return overlayMountSpec{
MountPoint: mountPath,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,4 @@ volumeMounts:
name: etc-kubernetes
- mountPath: /usr/libexec/kubernetes
name: usr-libexec-kubernetes
- mountPath: /opt
name: opt
```

0 comments on commit 5ff6cf8

Please sign in to comment.