containers/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-02-05 15:45:08 +01:00
Code Issues Releases Wiki Activity

Merge pull request #27579 from Luap99/vendor

Browse Source 
vendor: update common, image, storage to main
This commit is contained in:
openshift-merge-bot[bot]
2025-11-21 16:50:48 +00:00
committed by GitHub
parent ca465fc31c d163c38a26
commit 25c358e374
43 changed files with 454 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/specgen/generate/kube/kube.go
View File

@@ -397,7 +397,7 @@ func ToSpecGen(ctx context.Context, opts *CtrSpecGenOptions) (*specgen.SpecGener
s.ResourceLimits = &spec.LinuxResources{}
}
s.ResourceLimits.Pids = &spec.LinuxPids{
Limit: pidslimitAsInt,
Limit: &pidslimitAsInt,
}
}

2
pkg/specgen/resources_linux.go
View File

@@ -14,7 +14,7 @@ func (s *SpecGenerator) InitResourceLimits(rtc *config.Config) {
s.ResourceLimits = &spec.LinuxResources{}
}
s.ResourceLimits.Pids = &spec.LinuxPids{
Limit: limit,
Limit: &limit,
}
}
}