mirror of
https://github.com/containers/podman.git
synced 2025-11-13 01:29:06 +08:00
upgrade all dependencies
The dependabot does not update dependencies when they do not use a tag. This patch upgrades all untagged depenencies if possible. You can upgrade all dependencies with `go get -u ./... && make vendor` in theory however this failed since the k8s changes do not compile on go v1.16 so I only updated the other dependencies. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
28
vendor/github.com/opencontainers/runtime-tools/generate/config.go
generated
vendored
28
vendor/github.com/opencontainers/runtime-tools/generate/config.go
generated
vendored
@@ -123,6 +123,13 @@ func (g *Generator) initConfigLinuxResourcesPids() {
|
||||
}
|
||||
}
|
||||
|
||||
func (g *Generator) initConfigLinuxResourcesUnified() {
|
||||
g.initConfigLinuxResources()
|
||||
if g.Config.Linux.Resources.Unified == nil {
|
||||
g.Config.Linux.Resources.Unified = map[string]string{}
|
||||
}
|
||||
}
|
||||
|
||||
func (g *Generator) initConfigSolaris() {
|
||||
g.initConfig()
|
||||
if g.Config.Solaris == nil {
|
||||
@@ -185,24 +192,3 @@ func (g *Generator) initConfigVM() {
|
||||
g.Config.VM = &rspec.VM{}
|
||||
}
|
||||
}
|
||||
|
||||
func (g *Generator) initConfigVMHypervisor() {
|
||||
g.initConfigVM()
|
||||
if &g.Config.VM.Hypervisor == nil {
|
||||
g.Config.VM.Hypervisor = rspec.VMHypervisor{}
|
||||
}
|
||||
}
|
||||
|
||||
func (g *Generator) initConfigVMKernel() {
|
||||
g.initConfigVM()
|
||||
if &g.Config.VM.Kernel == nil {
|
||||
g.Config.VM.Kernel = rspec.VMKernel{}
|
||||
}
|
||||
}
|
||||
|
||||
func (g *Generator) initConfigVMImage() {
|
||||
g.initConfigVM()
|
||||
if &g.Config.VM.Image == nil {
|
||||
g.Config.VM.Image = rspec.VMImage{}
|
||||
}
|
||||
}
|
||||
|
||||
55
vendor/github.com/opencontainers/runtime-tools/generate/generate.go
generated
vendored
55
vendor/github.com/opencontainers/runtime-tools/generate/generate.go
generated
vendored
@@ -604,6 +604,12 @@ func (g *Generator) SetLinuxCgroupsPath(path string) {
|
||||
g.Config.Linux.CgroupsPath = path
|
||||
}
|
||||
|
||||
// SetLinuxIntelRdtClosID sets g.Config.Linux.IntelRdt.ClosID
|
||||
func (g *Generator) SetLinuxIntelRdtClosID(clos string) {
|
||||
g.initConfigLinuxIntelRdt()
|
||||
g.Config.Linux.IntelRdt.ClosID = clos
|
||||
}
|
||||
|
||||
// SetLinuxIntelRdtL3CacheSchema sets g.Config.Linux.IntelRdt.L3CacheSchema
|
||||
func (g *Generator) SetLinuxIntelRdtL3CacheSchema(schema string) {
|
||||
g.initConfigLinuxIntelRdt()
|
||||
@@ -851,6 +857,28 @@ func (g *Generator) DropLinuxResourcesHugepageLimit(pageSize string) {
|
||||
}
|
||||
}
|
||||
|
||||
// AddLinuxResourcesUnified sets the g.Config.Linux.Resources.Unified
|
||||
func (g *Generator) SetLinuxResourcesUnified(unified map[string]string) {
|
||||
g.initConfigLinuxResourcesUnified()
|
||||
for k, v := range unified {
|
||||
g.Config.Linux.Resources.Unified[k] = v
|
||||
}
|
||||
}
|
||||
|
||||
// AddLinuxResourcesUnified adds or updates the key-value pair from g.Config.Linux.Resources.Unified
|
||||
func (g *Generator) AddLinuxResourcesUnified(key, val string) {
|
||||
g.initConfigLinuxResourcesUnified()
|
||||
g.Config.Linux.Resources.Unified[key] = val
|
||||
}
|
||||
|
||||
// DropLinuxResourcesUnified drops a key-value pair from g.Config.Linux.Resources.Unified
|
||||
func (g *Generator) DropLinuxResourcesUnified(key string) {
|
||||
if g.Config == nil || g.Config.Linux == nil || g.Config.Linux.Resources == nil || g.Config.Linux.Resources.Unified == nil {
|
||||
return
|
||||
}
|
||||
delete(g.Config.Linux.Resources.Unified, key)
|
||||
}
|
||||
|
||||
// SetLinuxResourcesMemoryLimit sets g.Config.Linux.Resources.Memory.Limit.
|
||||
func (g *Generator) SetLinuxResourcesMemoryLimit(limit int64) {
|
||||
g.initConfigLinuxResourcesMemory()
|
||||
@@ -1025,10 +1053,9 @@ func (g *Generator) ClearPreStartHooks() {
|
||||
}
|
||||
|
||||
// AddPreStartHook add a prestart hook into g.Config.Hooks.Prestart.
|
||||
func (g *Generator) AddPreStartHook(preStartHook rspec.Hook) error {
|
||||
func (g *Generator) AddPreStartHook(preStartHook rspec.Hook) {
|
||||
g.initConfigHooks()
|
||||
g.Config.Hooks.Prestart = append(g.Config.Hooks.Prestart, preStartHook)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ClearPostStopHooks clear g.Config.Hooks.Poststop.
|
||||
@@ -1040,10 +1067,9 @@ func (g *Generator) ClearPostStopHooks() {
|
||||
}
|
||||
|
||||
// AddPostStopHook adds a poststop hook into g.Config.Hooks.Poststop.
|
||||
func (g *Generator) AddPostStopHook(postStopHook rspec.Hook) error {
|
||||
func (g *Generator) AddPostStopHook(postStopHook rspec.Hook) {
|
||||
g.initConfigHooks()
|
||||
g.Config.Hooks.Poststop = append(g.Config.Hooks.Poststop, postStopHook)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ClearPostStartHooks clear g.Config.Hooks.Poststart.
|
||||
@@ -1055,10 +1081,9 @@ func (g *Generator) ClearPostStartHooks() {
|
||||
}
|
||||
|
||||
// AddPostStartHook adds a poststart hook into g.Config.Hooks.Poststart.
|
||||
func (g *Generator) AddPostStartHook(postStartHook rspec.Hook) error {
|
||||
func (g *Generator) AddPostStartHook(postStartHook rspec.Hook) {
|
||||
g.initConfigHooks()
|
||||
g.Config.Hooks.Poststart = append(g.Config.Hooks.Poststart, postStartHook)
|
||||
return nil
|
||||
}
|
||||
|
||||
// AddMount adds a mount into g.Config.Mounts.
|
||||
@@ -1560,12 +1585,8 @@ func (g *Generator) RemoveLinuxResourcesDevice(allow bool, devType string, major
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// strPtr returns the pointer pointing to the string s.
|
||||
func strPtr(s string) *string { return &s }
|
||||
|
||||
// SetSyscallAction adds rules for syscalls with the specified action
|
||||
func (g *Generator) SetSyscallAction(arguments seccomp.SyscallOpts) error {
|
||||
g.initConfigLinuxSeccomp()
|
||||
@@ -1691,14 +1712,14 @@ func (g *Generator) SetVMHypervisorPath(path string) error {
|
||||
if !strings.HasPrefix(path, "/") {
|
||||
return fmt.Errorf("hypervisorPath %v is not an absolute path", path)
|
||||
}
|
||||
g.initConfigVMHypervisor()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Hypervisor.Path = path
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetVMHypervisorParameters sets g.Config.VM.Hypervisor.Parameters
|
||||
func (g *Generator) SetVMHypervisorParameters(parameters []string) {
|
||||
g.initConfigVMHypervisor()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Hypervisor.Parameters = parameters
|
||||
}
|
||||
|
||||
@@ -1707,14 +1728,14 @@ func (g *Generator) SetVMKernelPath(path string) error {
|
||||
if !strings.HasPrefix(path, "/") {
|
||||
return fmt.Errorf("kernelPath %v is not an absolute path", path)
|
||||
}
|
||||
g.initConfigVMKernel()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Kernel.Path = path
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetVMKernelParameters sets g.Config.VM.Kernel.Parameters
|
||||
func (g *Generator) SetVMKernelParameters(parameters []string) {
|
||||
g.initConfigVMKernel()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Kernel.Parameters = parameters
|
||||
}
|
||||
|
||||
@@ -1723,7 +1744,7 @@ func (g *Generator) SetVMKernelInitRD(initrd string) error {
|
||||
if !strings.HasPrefix(initrd, "/") {
|
||||
return fmt.Errorf("kernelInitrd %v is not an absolute path", initrd)
|
||||
}
|
||||
g.initConfigVMKernel()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Kernel.InitRD = initrd
|
||||
return nil
|
||||
}
|
||||
@@ -1733,7 +1754,7 @@ func (g *Generator) SetVMImagePath(path string) error {
|
||||
if !strings.HasPrefix(path, "/") {
|
||||
return fmt.Errorf("imagePath %v is not an absolute path", path)
|
||||
}
|
||||
g.initConfigVMImage()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Image.Path = path
|
||||
return nil
|
||||
}
|
||||
@@ -1749,7 +1770,7 @@ func (g *Generator) SetVMImageFormat(format string) error {
|
||||
default:
|
||||
return fmt.Errorf("Commonly supported formats are: raw, qcow2, vdi, vmdk, vhd")
|
||||
}
|
||||
g.initConfigVMImage()
|
||||
g.initConfigVM()
|
||||
g.Config.VM.Image.Format = format
|
||||
return nil
|
||||
}
|
||||
|
||||
5
vendor/github.com/opencontainers/runtime-tools/generate/seccomp/consts.go
generated
vendored
5
vendor/github.com/opencontainers/runtime-tools/generate/seccomp/consts.go
generated
vendored
@@ -4,9 +4,4 @@ const (
|
||||
seccompOverwrite = "overwrite"
|
||||
seccompAppend = "append"
|
||||
nothing = "nothing"
|
||||
kill = "kill"
|
||||
trap = "trap"
|
||||
trace = "trace"
|
||||
allow = "allow"
|
||||
errno = "errno"
|
||||
)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
//go:build linux
|
||||
// +build linux
|
||||
|
||||
package seccomp
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
//go:build !linux
|
||||
// +build !linux
|
||||
|
||||
package seccomp
|
||||
|
||||
16
vendor/github.com/opencontainers/runtime-tools/generate/seccomp/syscall_compare.go
generated
vendored
16
vendor/github.com/opencontainers/runtime-tools/generate/seccomp/syscall_compare.go
generated
vendored
@@ -92,22 +92,6 @@ func identical(config1, config2 *rspec.LinuxSyscall) bool {
|
||||
return reflect.DeepEqual(config1, config2)
|
||||
}
|
||||
|
||||
func identicalExceptAction(config1, config2 *rspec.LinuxSyscall) bool {
|
||||
samename := sameName(config1, config2)
|
||||
sameAction := sameAction(config1, config2)
|
||||
sameArgs := sameArgs(config1, config2)
|
||||
|
||||
return samename && !sameAction && sameArgs
|
||||
}
|
||||
|
||||
func identicalExceptArgs(config1, config2 *rspec.LinuxSyscall) bool {
|
||||
samename := sameName(config1, config2)
|
||||
sameAction := sameAction(config1, config2)
|
||||
sameArgs := sameArgs(config1, config2)
|
||||
|
||||
return samename && sameAction && !sameArgs
|
||||
}
|
||||
|
||||
func sameName(config1, config2 *rspec.LinuxSyscall) bool {
|
||||
return reflect.DeepEqual(config1.Names, config2.Names)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user