mirror of
https://github.com/containers/podman.git
synced 2025-12-02 19:28:58 +08:00
vendor: bump containers/(storage, common, buildah, image)
Bump containers/(storage, common, buildah and image) Changes since 2023-01-01: - skip mount-cache-selinux-long-name test under remote, with a FIXME requesting that someone see if it can be made to work. - skip six tests that fail under rootless-remote - add new --build-arg-file option: - update man page Squash of: *cf56eb1865*561f082772Signed-off-by: Ed Santiago <santiago@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Aditya R <arajan@redhat.com>
This commit is contained in:
8
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
8
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -71,6 +71,12 @@ var (
|
||||
"/usr/lib/cni",
|
||||
"/opt/cni/bin",
|
||||
}
|
||||
DefaultNetavarkPluginDirs = []string{
|
||||
"/usr/local/libexec/netavark",
|
||||
"/usr/libexec/netavark",
|
||||
"/usr/local/lib/netavark",
|
||||
"/usr/lib/netavark",
|
||||
}
|
||||
DefaultSubnetPools = []SubnetPool{
|
||||
// 10.89.0.0/24-10.255.255.0/24
|
||||
parseSubnetPool("10.89.0.0/16", 24),
|
||||
@@ -214,6 +220,7 @@ func DefaultConfig() (*Config, error) {
|
||||
DefaultSubnetPools: DefaultSubnetPools,
|
||||
DNSBindPort: 0,
|
||||
CNIPluginDirs: DefaultCNIPluginDirs,
|
||||
NetavarkPluginDirs: DefaultNetavarkPluginDirs,
|
||||
},
|
||||
Engine: *defaultEngineConfig,
|
||||
Secrets: defaultSecretConfig(),
|
||||
@@ -418,6 +425,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
|
||||
c.PodExitPolicy = defaultPodExitPolicy
|
||||
c.SSHConfig = getDefaultSSHConfig()
|
||||
c.KubeGenerateType = "pod"
|
||||
|
||||
return c, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user