瀏覽代碼

pkg/idtools: remove deprecated NewIdentityMapping, UIDS() and GIDS()

These were deprecated in 098a44c07f38a14147a57feffa31b551a47f3c73, which is
in the 22.06 branch, and no longer in use since e05f614267213c93bd941d8a8980a0265a2e4634
so we can remove them from the master branch.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 年之前
父節點
當前提交
df965f51bf
共有 2 個文件被更改,包括 0 次插入27 次删除
  1. 0 14
      pkg/idtools/idtools.go
  2. 0 13
      pkg/idtools/idtools_unix.go

+ 0 - 14
pkg/idtools/idtools.go

@@ -162,20 +162,6 @@ func (i IdentityMapping) Empty() bool {
 	return len(i.UIDMaps) == 0 && len(i.GIDMaps) == 0
 	return len(i.UIDMaps) == 0 && len(i.GIDMaps) == 0
 }
 }
 
 
-// UIDs returns the mapping for UID.
-//
-// Deprecated: reference the UIDMaps field directly.
-func (i IdentityMapping) UIDs() []IDMap {
-	return i.UIDMaps
-}
-
-// GIDs returns the mapping for GID.
-//
-// Deprecated: reference the GIDMaps field directly.
-func (i IdentityMapping) GIDs() []IDMap {
-	return i.GIDMaps
-}
-
 func createIDMap(subidRanges ranges) []IDMap {
 func createIDMap(subidRanges ranges) []IDMap {
 	idMap := []IDMap{}
 	idMap := []IDMap{}
 
 

+ 0 - 13
pkg/idtools/idtools_unix.go

@@ -237,19 +237,6 @@ func setPermissions(p string, mode os.FileMode, uid, gid int, stat *system.StatT
 	return os.Chown(p, uid, gid)
 	return os.Chown(p, uid, gid)
 }
 }
 
 
-// NewIdentityMapping takes a requested username and
-// using the data from /etc/sub{uid,gid} ranges, creates the
-// proper uid and gid remapping ranges for that user/group pair
-//
-// Deprecated: Use LoadIdentityMapping.
-func NewIdentityMapping(name string) (*IdentityMapping, error) {
-	m, err := LoadIdentityMapping(name)
-	if err != nil {
-		return nil, err
-	}
-	return &m, err
-}
-
 // LoadIdentityMapping takes a requested username and
 // LoadIdentityMapping takes a requested username and
 // using the data from /etc/sub{uid,gid} ranges, creates the
 // using the data from /etc/sub{uid,gid} ranges, creates the
 // proper uid and gid remapping ranges for that user/group pair
 // proper uid and gid remapping ranges for that user/group pair