rebase: update K8s packages to v0.32.1

Update K8s packages in go.mod to v0.32.1

Signed-off-by: Praveen M <m.praveen@ibm.com>
This commit is contained in:
Praveen M
2025-01-16 09:41:46 +05:30
committed by mergify[bot]
parent 5aef21ea4e
commit 7eb99fc6c9
2442 changed files with 273386 additions and 47788 deletions

View File

@ -120,10 +120,7 @@ func Relabel(path string, fileLabel string, shared bool) error {
c["level"] = "s0"
fileLabel = c.Get()
}
if err := selinux.Chcon(path, fileLabel, true); err != nil {
return err
}
return nil
return selinux.Chcon(path, fileLabel, true)
}
// DisableSecOpt returns a security opt that can disable labeling

View File

@ -6,25 +6,25 @@ package label
// InitLabels returns the process label and file labels to be used within
// the container. A list of options can be passed into this function to alter
// the labels.
func InitLabels(options []string) (string, string, error) {
func InitLabels([]string) (string, string, error) {
return "", "", nil
}
// Deprecated: The GenLabels function is only to be used during the transition
// to the official API. Use InitLabels(strings.Fields(options)) instead.
func GenLabels(options string) (string, string, error) {
func GenLabels(string) (string, string, error) {
return "", "", nil
}
func SetFileLabel(path string, fileLabel string) error {
func SetFileLabel(string, string) error {
return nil
}
func SetFileCreateLabel(fileLabel string) error {
func SetFileCreateLabel(string) error {
return nil
}
func Relabel(path string, fileLabel string, shared bool) error {
func Relabel(string, string, bool) error {
return nil
}
@ -35,16 +35,16 @@ func DisableSecOpt() []string {
}
// Validate checks that the label does not include unexpected options
func Validate(label string) error {
func Validate(string) error {
return nil
}
// RelabelNeeded checks whether the user requested a relabel
func RelabelNeeded(label string) bool {
func RelabelNeeded(string) bool {
return false
}
// IsShared checks that the label includes a "shared" mark
func IsShared(label string) bool {
func IsShared(string) bool {
return false
}

View File

@ -132,7 +132,7 @@ func verifySELinuxfsMount(mnt string) bool {
if err == nil {
break
}
if err == unix.EAGAIN || err == unix.EINTR { //nolint:errorlint // unix errors are bare
if err == unix.EAGAIN || err == unix.EINTR {
continue
}
return false
@ -263,7 +263,7 @@ func isProcHandle(fh *os.File) error {
if err == nil {
break
}
if err != unix.EINTR { //nolint:errorlint // unix errors are bare
if err != unix.EINTR {
return &os.PathError{Op: "fstatfs", Path: fh.Name(), Err: err}
}
}
@ -328,8 +328,8 @@ func lSetFileLabel(fpath string, label string) error {
if err == nil {
break
}
if err != unix.EINTR { //nolint:errorlint // unix errors are bare
return &os.PathError{Op: "lsetxattr", Path: fpath, Err: err}
if err != unix.EINTR {
return &os.PathError{Op: fmt.Sprintf("lsetxattr(label=%s)", label), Path: fpath, Err: err}
}
}
@ -347,8 +347,8 @@ func setFileLabel(fpath string, label string) error {
if err == nil {
break
}
if err != unix.EINTR { //nolint:errorlint // unix errors are bare
return &os.PathError{Op: "setxattr", Path: fpath, Err: err}
if err != unix.EINTR {
return &os.PathError{Op: fmt.Sprintf("setxattr(label=%s)", label), Path: fpath, Err: err}
}
}
@ -639,6 +639,7 @@ func (m mlsRange) String() string {
return low + "-" + high
}
// TODO: remove min and max once Go < 1.21 is not supported.
func max(a, b uint) uint {
if a > b {
return a
@ -1134,7 +1135,7 @@ func rchcon(fpath, label string) error { //revive:disable:cognitive-complexity
}
return pwalkdir.Walk(fpath, func(p string, _ fs.DirEntry, _ error) error {
if fastMode {
if cLabel, err := lFileLabel(fpath); err == nil && cLabel == label {
if cLabel, err := lFileLabel(p); err == nil && cLabel == label {
return nil
}
}

View File

@ -7,7 +7,7 @@ func attrPath(string) string {
return ""
}
func readCon(fpath string) (string, error) {
func readCon(string) (string, error) {
return "", nil
}
@ -21,27 +21,27 @@ func getEnabled() bool {
return false
}
func classIndex(class string) (int, error) {
func classIndex(string) (int, error) {
return -1, nil
}
func setFileLabel(fpath string, label string) error {
func setFileLabel(string, string) error {
return nil
}
func lSetFileLabel(fpath string, label string) error {
func lSetFileLabel(string, string) error {
return nil
}
func fileLabel(fpath string) (string, error) {
func fileLabel(string) (string, error) {
return "", nil
}
func lFileLabel(fpath string) (string, error) {
func lFileLabel(string) (string, error) {
return "", nil
}
func setFSCreateLabel(label string) error {
func setFSCreateLabel(string) error {
return nil
}
@ -53,7 +53,7 @@ func currentLabel() (string, error) {
return "", nil
}
func pidLabel(pid int) (string, error) {
func pidLabel(int) (string, error) {
return "", nil
}
@ -61,23 +61,23 @@ func execLabel() (string, error) {
return "", nil
}
func canonicalizeContext(val string) (string, error) {
func canonicalizeContext(string) (string, error) {
return "", nil
}
func computeCreateContext(source string, target string, class string) (string, error) {
func computeCreateContext(string, string, string) (string, error) {
return "", nil
}
func calculateGlbLub(sourceRange, targetRange string) (string, error) {
func calculateGlbLub(string, string) (string, error) {
return "", nil
}
func peerLabel(fd uintptr) (string, error) {
func peerLabel(uintptr) (string, error) {
return "", nil
}
func setKeyLabel(label string) error {
func setKeyLabel(string) error {
return nil
}
@ -85,14 +85,14 @@ func (c Context) get() string {
return ""
}
func newContext(label string) (Context, error) {
func newContext(string) (Context, error) {
return Context{}, nil
}
func clearLabels() {
}
func reserveLabel(label string) {
func reserveLabel(string) {
}
func isMLSEnabled() bool {
@ -103,7 +103,7 @@ func enforceMode() int {
return Disabled
}
func setEnforceMode(mode int) error {
func setEnforceMode(int) error {
return nil
}
@ -111,7 +111,7 @@ func defaultEnforceMode() int {
return Disabled
}
func releaseLabel(label string) {
func releaseLabel(string) {
}
func roFileLabel() string {
@ -126,27 +126,27 @@ func initContainerLabels() (string, string) {
return "", ""
}
func containerLabels() (processLabel string, fileLabel string) {
func containerLabels() (string, string) {
return "", ""
}
func securityCheckContext(val string) error {
func securityCheckContext(string) error {
return nil
}
func copyLevel(src, dest string) (string, error) {
func copyLevel(string, string) (string, error) {
return "", nil
}
func chcon(fpath string, label string, recurse bool) error {
func chcon(string, string, bool) error {
return nil
}
func dupSecOpt(src string) ([]string, error) {
func dupSecOpt(string) ([]string, error) {
return nil, nil
}
func getDefaultContextWithLevel(user, level, scon string) (string, error) {
func getDefaultContextWithLevel(string, string, string) (string, error) {
return "", nil
}

View File

@ -31,7 +31,7 @@ func lgetxattr(path, attr string) ([]byte, error) {
func doLgetxattr(path, attr string, dest []byte) (int, error) {
for {
sz, err := unix.Lgetxattr(path, attr, dest)
if err != unix.EINTR { //nolint:errorlint // unix errors are bare
if err != unix.EINTR {
return sz, err
}
}
@ -64,7 +64,7 @@ func getxattr(path, attr string) ([]byte, error) {
func dogetxattr(path, attr string, dest []byte) (int, error) {
for {
sz, err := unix.Getxattr(path, attr, dest)
if err != unix.EINTR { //nolint:errorlint // unix errors are bare
if err != unix.EINTR {
return sz, err
}
}

View File

@ -28,7 +28,9 @@ Please note the following limitations of this code:
* fs.SkipDir is not supported;
* no errors are ever passed to WalkDirFunc;
* ErrNotExist errors from filepath.WalkDir are silently ignored for any path
except the top directory (WalkDir argument); any other error is returned to
the caller of WalkDir;
* once any error is returned from any walkDirFunc instance, no more calls
to WalkDirFunc are made, and the error is returned to the caller of WalkDir;
@ -51,4 +53,4 @@ filepath.WalkDir.
Otherwise (if a WalkDirFunc is actually doing something) this is usually
faster, except when the WalkDirN(..., 1) is used. Run `go test -bench .`
to see how different operations can benefit from it, as well as how the
level of paralellism affects the speed.
level of parallelism affects the speed.

View File

@ -4,6 +4,7 @@
package pwalkdir
import (
"errors"
"fmt"
"io/fs"
"path/filepath"
@ -60,6 +61,12 @@ func WalkN(root string, walkFn fs.WalkDirFunc, num int) error {
go func() {
err = filepath.WalkDir(root, func(p string, entry fs.DirEntry, err error) error {
if err != nil {
// Walking a file tree can race with removal,
// so ignore ENOENT, except for root.
// https://github.com/opencontainers/selinux/issues/199.
if errors.Is(err, fs.ErrNotExist) && len(p) != rootLen {
return nil
}
close(files)
return err
}