mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-13 23:15:10 +00:00
Automatic merge from submit-queue (batch tested with PRs 62657, 63278, 62903, 63375). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add more volume types in e2e and fix part of them. **What this PR does / why we need it**: - Add dir-link/dir-bindmounted/dir-link-bindmounted/bockfs volume types for e2e tests. - Fix fsGroup related e2e tests partially. - Return error if we cannot resolve volume path. - Because we should not fallback to volume path, if it's a symbolic link, we may get wrong results. To safely set fsGroup on local volume, we need to implement these two methods correctly for all volume types both on the host and in container: - get volume path kubelet can access - paths on the host and in container are different - get mount references - for directories, we cannot use its mount source (device field) to identify mount references, because directories on same filesystem have same mount source (e.g. tmpfs), we need to check filesystem's major:minor and directory root path on it Here is current status: | | (A) volume-path (host) | (B) volume-path (container) | (C) mount-refs (host) | (D) mount-refs (container) | | --- | --- | --- | --- | --- | | (1) dir | OK | FAIL | FAIL | FAIL | | (2) dir-link | OK | FAIL | FAIL | FAIL | | (3) dir-bindmounted | OK | FAIL | FAIL | FAIL | | (4) dir-link-bindmounted | OK | FAIL | FAIL | FAIL | | (5) tmpfs| OK | FAIL | FAIL | FAIL | | (6) blockfs| OK | FAIL | OK | FAIL | | (7) block| NOTNEEDED | NOTNEEDED | NOTNEEDED | NOTNEEDED | | (8) gce-localssd-scsi-fs| NOTTESTED | NOTTESTED | NOTTESTED | NOTTESTED | - This PR uses `nsenter ... readlink` to resolve path in container as @msau42 @jsafrane [suggested](https://github.com/kubernetes/kubernetes/pull/61489#pullrequestreview-110032850). This fixes B1:B6 and D6, , the rest will be addressed in https://github.com/kubernetes/kubernetes/pull/62102. - C5:D5 marked `FAIL` because `tmpfs` filesystems can share same mount source, we cannot rely on it to check mount references. e2e tests passes due to we use unique mount source string in tests. - A7:D7 marked `NOTNEEDED` because we don't set fsGroup on block devices in local plugin. (TODO: Should we set fsGroup on block device?) - A8:D8 marked `NOTTESTED` because I didn't test it, I leave it to `pull-kubernetes-e2e-gce`. I think it should be same as `blockfs`. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
109 lines
2.6 KiB
Go
109 lines
2.6 KiB
Go
// +build !linux
|
|
|
|
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package mount
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
)
|
|
|
|
type NsenterMounter struct{}
|
|
|
|
func NewNsenterMounter() (*NsenterMounter, error) {
|
|
return &NsenterMounter{}, nil
|
|
}
|
|
|
|
var _ = Interface(&NsenterMounter{})
|
|
|
|
func (*NsenterMounter) Mount(source string, target string, fstype string, options []string) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) Unmount(target string) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) List() ([]MountPoint, error) {
|
|
return []MountPoint{}, nil
|
|
}
|
|
|
|
func (m *NsenterMounter) IsNotMountPoint(dir string) (bool, error) {
|
|
return IsNotMountPoint(m, dir)
|
|
}
|
|
|
|
func (*NsenterMounter) IsMountPointMatch(mp MountPoint, dir string) bool {
|
|
return (mp.Path == dir)
|
|
}
|
|
|
|
func (*NsenterMounter) IsLikelyNotMountPoint(file string) (bool, error) {
|
|
return true, nil
|
|
}
|
|
|
|
func (*NsenterMounter) DeviceOpened(pathname string) (bool, error) {
|
|
return false, nil
|
|
}
|
|
|
|
func (*NsenterMounter) PathIsDevice(pathname string) (bool, error) {
|
|
return true, nil
|
|
}
|
|
|
|
func (*NsenterMounter) GetDeviceNameFromMount(mountPath, pluginDir string) (string, error) {
|
|
return "", nil
|
|
}
|
|
|
|
func (*NsenterMounter) MakeRShared(path string) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) GetFileType(_ string) (FileType, error) {
|
|
return FileType("fake"), errors.New("not implemented")
|
|
}
|
|
|
|
func (*NsenterMounter) MakeDir(pathname string) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) MakeFile(pathname string) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) ExistsPath(pathname string) bool {
|
|
return true
|
|
}
|
|
|
|
func (*NsenterMounter) SafeMakeDir(pathname string, base string, perm os.FileMode) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) PrepareSafeSubpath(subPath Subpath) (newHostPath string, cleanupAction func(), err error) {
|
|
return subPath.Path, nil, nil
|
|
}
|
|
|
|
func (*NsenterMounter) CleanSubPaths(podDir string, volumeName string) error {
|
|
return nil
|
|
}
|
|
|
|
func (*NsenterMounter) GetMountRefs(pathname string) ([]string, error) {
|
|
return nil, errors.New("not implemented")
|
|
}
|
|
|
|
func (*NsenterMounter) GetFSGroup(pathname string) (int64, error) {
|
|
return -1, errors.New("not implemented")
|
|
}
|