mirror of
https://github.com/containers/podman.git
synced 2025-12-02 19:17:00 +08:00
vendor: update containers/{buildah,common,image,storage}
The change in healthcheck_run_test.go, depends on the containers/image change: commit b6afa8ca7b324aca8fd5a7b5b206fc05c0c04874 Author: Mikhail Sokolov <msokolov@evolution.com> Date: Fri Mar 15 13:37:44 2024 +0200 Add support for Docker HealthConfig.StartInterval (v25.0.0+) Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/common/libnetwork/cni/cni_types.go
generated
vendored
4
vendor/github.com/containers/common/libnetwork/cni/cni_types.go
generated
vendored
@@ -4,10 +4,10 @@ package cni
|
||||
|
||||
import (
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/containers/common/libnetwork/types"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -250,7 +250,7 @@ func newDNSNamePlugin(domainName string) dnsNameConfig {
|
||||
// hasDNSNamePlugin looks to see if the dnsname cni plugin is present
|
||||
func hasDNSNamePlugin(paths []string) bool {
|
||||
for _, p := range paths {
|
||||
if _, err := os.Stat(filepath.Join(p, "dnsname")); err == nil {
|
||||
if err := fileutils.Exists(filepath.Join(p, "dnsname")); err == nil {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
3
vendor/github.com/containers/common/libnetwork/cni/network.go
generated
vendored
3
vendor/github.com/containers/common/libnetwork/cni/network.go
generated
vendored
@@ -19,6 +19,7 @@ import (
|
||||
"github.com/containers/common/libnetwork/types"
|
||||
"github.com/containers/common/pkg/config"
|
||||
"github.com/containers/common/pkg/version"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/containers/storage/pkg/lockfile"
|
||||
"github.com/containers/storage/pkg/unshare"
|
||||
"github.com/sirupsen/logrus"
|
||||
@@ -331,7 +332,7 @@ func (n *cniNetwork) NetworkInfo() types.NetworkInfo {
|
||||
if err != nil {
|
||||
logrus.Infof("Failed to get the dnsname plugin version: %v", err)
|
||||
}
|
||||
if _, err := os.Stat(dnsPath); err == nil {
|
||||
if err := fileutils.Exists(dnsPath); err == nil {
|
||||
info.DNS = types.DNSNetworkInfo{
|
||||
Path: dnsPath,
|
||||
Package: dnsPackage,
|
||||
|
||||
7
vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go
generated
vendored
7
vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go
generated
vendored
@@ -16,6 +16,7 @@ import (
|
||||
"github.com/containers/common/pkg/config"
|
||||
"github.com/containers/common/pkg/netns"
|
||||
"github.com/containers/common/pkg/systemd"
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/containers/storage/pkg/homedir"
|
||||
"github.com/containers/storage/pkg/lockfile"
|
||||
"github.com/hashicorp/go-multierror"
|
||||
@@ -154,7 +155,7 @@ func (n *Netns) getOrCreateNetns() (ns.NetNS, bool, error) {
|
||||
}
|
||||
|
||||
func (n *Netns) cleanup() error {
|
||||
if _, err := os.Stat(n.dir); err != nil {
|
||||
if err := fileutils.Exists(n.dir); err != nil {
|
||||
if errors.Is(err, fs.ErrNotExist) {
|
||||
// dir does not exists no need for cleanup
|
||||
return nil
|
||||
@@ -337,7 +338,7 @@ func (n *Netns) setupMounts() error {
|
||||
// 2. Also keep /run/systemd if it exists.
|
||||
// Many files are symlinked into this dir, for example /dev/log.
|
||||
runSystemd := "/run/systemd"
|
||||
_, err = os.Stat(runSystemd)
|
||||
err = fileutils.Exists(runSystemd)
|
||||
if err == nil {
|
||||
newRunSystemd := n.getPath(runSystemd)
|
||||
err = mountAndMkdirDest(runSystemd, newRunSystemd, none, unix.MS_BIND|unix.MS_REC)
|
||||
@@ -476,7 +477,7 @@ func (n *Netns) mountCNIVarDir() error {
|
||||
// while we could always use /var there are cases where a user might store the cni
|
||||
// configs under /var/custom and this would break
|
||||
for {
|
||||
if _, err := os.Stat(varTarget); err == nil {
|
||||
if err := fileutils.Exists(varTarget); err == nil {
|
||||
varDir = n.getPath(varTarget)
|
||||
break
|
||||
}
|
||||
|
||||
5
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
5
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
@@ -376,6 +376,11 @@ func (n *netavarkNetwork) NetworkRemove(nameOrID string) error {
|
||||
return fmt.Errorf("default network %s cannot be removed", n.defaultNetwork)
|
||||
}
|
||||
|
||||
// remove the ipam bucket for this network
|
||||
if err := n.removeNetworkIPAMBucket(network); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
file := filepath.Join(n.networkConfigDir, network.Name+".json")
|
||||
// make sure to not error for ErrNotExist
|
||||
if err := os.Remove(file); err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||
|
||||
21
vendor/github.com/containers/common/libnetwork/netavark/ipam.go
generated
vendored
21
vendor/github.com/containers/common/libnetwork/netavark/ipam.go
generated
vendored
@@ -4,6 +4,7 @@ package netavark
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
|
||||
@@ -357,6 +358,26 @@ func (n *netavarkNetwork) deallocIPs(opts *types.NetworkOptions) error {
|
||||
return err
|
||||
}
|
||||
|
||||
func (n *netavarkNetwork) removeNetworkIPAMBucket(network *types.Network) error {
|
||||
if !requiresIPAMAlloc(network) {
|
||||
return nil
|
||||
}
|
||||
db, err := n.openDB()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
return db.Update(func(tx *bbolt.Tx) error {
|
||||
// Ignore ErrBucketNotFound, can happen if the network never allocated any ips,
|
||||
// i.e. because no container was started.
|
||||
if err := tx.DeleteBucket([]byte(network.Name)); err != nil && !errors.Is(err, bbolt.ErrBucketNotFound) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// requiresIPAMAlloc return true when we have to allocate ips for this network
|
||||
// it checks the ipam driver and if subnets are set
|
||||
func requiresIPAMAlloc(network *types.Network) bool {
|
||||
|
||||
3
vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go
generated
vendored
3
vendor/github.com/containers/common/libnetwork/resolvconf/resolv.go
generated
vendored
@@ -7,6 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/storage/pkg/fileutils"
|
||||
"github.com/opencontainers/runtime-spec/specs-go"
|
||||
"github.com/sirupsen/logrus"
|
||||
"golang.org/x/exp/slices"
|
||||
@@ -61,7 +62,7 @@ func getDefaultResolvConf(params *Params) ([]byte, bool, error) {
|
||||
if ns.Path != "" && !strings.HasPrefix(ns.Path, "/proc/") {
|
||||
// check for netns created by "ip netns"
|
||||
path := filepath.Join("/etc/netns", filepath.Base(ns.Path), "resolv.conf")
|
||||
_, err := os.Stat(path)
|
||||
err := fileutils.Exists(path)
|
||||
if err == nil {
|
||||
resolveConf = path
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user