mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 02:43:36 +00:00
vendor updates
This commit is contained in:
4
vendor/k8s.io/kubernetes/pkg/kubelet/rkt/BUILD
generated
vendored
4
vendor/k8s.io/kubernetes/pkg/kubelet/rkt/BUILD
generated
vendored
@ -22,6 +22,7 @@ go_library(
|
||||
importpath = "k8s.io/kubernetes/pkg/kubelet/rkt",
|
||||
deps = [
|
||||
"//pkg/credentialprovider:go_default_library",
|
||||
"//pkg/credentialprovider/secrets:go_default_library",
|
||||
"//pkg/kubelet/container:go_default_library",
|
||||
"//pkg/kubelet/events:go_default_library",
|
||||
"//pkg/kubelet/images:go_default_library",
|
||||
@ -66,8 +67,7 @@ go_test(
|
||||
"fake_rkt_interface_test.go",
|
||||
"rkt_test.go",
|
||||
],
|
||||
importpath = "k8s.io/kubernetes/pkg/kubelet/rkt",
|
||||
library = ":go_default_library",
|
||||
embed = [":go_default_library"],
|
||||
deps = [
|
||||
"//pkg/kubelet/container:go_default_library",
|
||||
"//pkg/kubelet/container/testing:go_default_library",
|
||||
|
4
vendor/k8s.io/kubernetes/pkg/kubelet/rkt/fake_rkt_interface_test.go
generated
vendored
4
vendor/k8s.io/kubernetes/pkg/kubelet/rkt/fake_rkt_interface_test.go
generated
vendored
@ -27,7 +27,6 @@ import (
|
||||
"golang.org/x/net/context"
|
||||
"google.golang.org/grpc"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
kubetypes "k8s.io/apimachinery/pkg/types"
|
||||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||
)
|
||||
|
||||
@ -195,7 +194,6 @@ func (f *fakePodDeletionProvider) IsPodDeleted(uid types.UID) bool {
|
||||
|
||||
type fakeUnitGetter struct {
|
||||
networkNamespace kubecontainer.ContainerID
|
||||
callServices []string
|
||||
}
|
||||
|
||||
func newfakeUnitGetter() *fakeUnitGetter {
|
||||
@ -204,7 +202,7 @@ func newfakeUnitGetter() *fakeUnitGetter {
|
||||
}
|
||||
}
|
||||
|
||||
func (f *fakeUnitGetter) getNetworkNamespace(uid kubetypes.UID, latestPod *rktapi.Pod) (kubecontainer.ContainerID, error) {
|
||||
func (f *fakeUnitGetter) getNetworkNamespace(uid types.UID, latestPod *rktapi.Pod) (kubecontainer.ContainerID, error) {
|
||||
return kubecontainer.ContainerID{ID: "42"}, nil
|
||||
}
|
||||
|
||||
|
3
vendor/k8s.io/kubernetes/pkg/kubelet/rkt/image.go
generated
vendored
3
vendor/k8s.io/kubernetes/pkg/kubelet/rkt/image.go
generated
vendored
@ -35,6 +35,7 @@ import (
|
||||
"golang.org/x/net/context"
|
||||
"k8s.io/api/core/v1"
|
||||
"k8s.io/kubernetes/pkg/credentialprovider"
|
||||
credentialprovidersecrets "k8s.io/kubernetes/pkg/credentialprovider/secrets"
|
||||
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
||||
"k8s.io/kubernetes/pkg/util/parsers"
|
||||
)
|
||||
@ -54,7 +55,7 @@ func (r *Runtime) PullImage(image kubecontainer.ImageSpec, pullSecrets []v1.Secr
|
||||
return "", err
|
||||
}
|
||||
|
||||
keyring, err := credentialprovider.MakeDockerKeyring(pullSecrets, r.dockerKeyring)
|
||||
keyring, err := credentialprovidersecrets.MakeDockerKeyring(pullSecrets, r.dockerKeyring)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
Reference in New Issue
Block a user