mirror of
https://github.com/containers/podman.git
synced 2025-12-13 18:37:36 +08:00
vendor c/image v5.4.2
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
4
vendor/github.com/containers/image/v5/openshift/openshift-copies.go
generated
vendored
4
vendor/github.com/containers/image/v5/openshift/openshift-copies.go
generated
vendored
@@ -16,12 +16,12 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/containers/storage/pkg/homedir"
|
||||
"github.com/ghodss/yaml"
|
||||
"github.com/imdario/mergo"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
"golang.org/x/net/http2"
|
||||
"k8s.io/client-go/util/homedir"
|
||||
)
|
||||
|
||||
// restTLSClientConfig is a modified copy of k8s.io/kubernets/pkg/client/restclient.TLSClientConfig.
|
||||
@@ -90,7 +90,7 @@ func defaultClientConfig() clientConfig {
|
||||
return clientConfig
|
||||
}
|
||||
|
||||
var recommendedHomeFile = path.Join(homedir.HomeDir(), ".kube/config")
|
||||
var recommendedHomeFile = path.Join(homedir.Get(), ".kube/config")
|
||||
|
||||
// newOpenShiftClientConfigLoadingRules is a modified copy of openshift/origin/pkg/cmd/cli/config.NewOpenShiftClientConfigLoadingRules.
|
||||
// NewOpenShiftClientConfigLoadingRules returns file priority loading rules for OpenShift.
|
||||
|
||||
Reference in New Issue
Block a user