github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

pkg/kubelet/rktshim: deprecate kubelet/container API usage

Browse Source
This commit is contained in:
Tamer Tas 2016-08-12 21:49:11 +03:00
parent 72f41ff8cf
commit 70b5ed2665
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/rktshim/imagestore.go
View File

@ -19,7 +19,7 @@ package rktshim
import (
"errors"
"k8s.io/kubernetes/pkg/kubelet/container"
runtimeApi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
)
// TODO(tmrts): Move these errors to the container API for code re-use.
@ -27,7 +27,7 @@ var (
ErrImageNotFound = errors.New("rktshim: image not found")
)
var _ container.ImageService = (*ImageStore)(nil)
// var _ kubeletApi.ImageManagerService = (*ImageStore)(nil)
// ImageStore supports CRUD operations for images.
type ImageStore struct{}
@ -36,26 +36,26 @@ type ImageStore struct{}
type ImageStoreConfig struct{}
// NewImageStore creates an image storage that allows CRUD operations for images.
func NewImageStore(ImageStoreConfig) (container.ImageService, error) {
func NewImageStore(ImageStoreConfig) (*ImageStore, error) {
return &ImageStore{}, nil
}
// List lists the images residing in the image store.
func (*ImageStore) List() ([]container.Image, error) {
func (*ImageStore) List() ([]runtimeApi.Image, error) {
panic("not implemented")
}
// Pull pulls an image into the image store and uses the given authentication method.
func (*ImageStore) Pull(container.ImageSpec, container.AuthConfig, *container.PodSandboxConfig) error {
func (*ImageStore) Pull(runtimeApi.ImageSpec, runtimeApi.AuthConfig, *runtimeApi.PodSandboxConfig) error {
panic("not implemented")
}
// Remove removes the image from the image store.
func (*ImageStore) Remove(container.ImageSpec) error {
func (*ImageStore) Remove(runtimeApi.ImageSpec) error {
panic("not implemented")
}
// Status returns the status of the image.
func (*ImageStore) Status(container.ImageSpec) (container.Image, error) {
func (*ImageStore) Status(runtimeApi.ImageSpec) (runtimeApi.Image, error) {
panic("not implemented")
}

53
pkg/kubelet/rktshim/imagestore_test.go
View File

@ -21,72 +21,77 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/kubelet/container"
runtimeApi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
)
var (
emptyImgStoreConfig = ImageStoreConfig{}
// TODO(tmrts): fill the pod configuration
testPodConfig *container.PodSandboxConfig = nil
testPodConfig *runtimeApi.PodSandboxConfig = nil
)
type imageTestCase struct {
Spec *container.ImageSpec
ExpectedStatus *container.Image
Spec *runtimeApi.ImageSpec
ExpectedStatus *runtimeApi.Image
}
func compareContainerImages(got, expected container.Image) error {
if got.ID != expected.ID {
return fmt.Errorf("mismatching IDs -> expected %q, got %q", got.ID, expected.ID)
func compareContainerImages(got, expected runtimeApi.Image) error {
if got.Id != expected.Id {
return fmt.Errorf("mismatching Ids -> expected %q, got %q", got.Id, expected.Id)
}
if !reflect.DeepEqual(got.RepoTags, expected.RepoTags) {
return fmt.Errorf("mismatching RepoTags -> expected %q, got %q", got.ID, expected.ID)
return fmt.Errorf("mismatching RepoTags -> expected %q, got %q", got.Id, expected.Id)
}
if !reflect.DeepEqual(got.RepoDigests, expected.RepoDigests) {
return fmt.Errorf("mismatching RepoDigests -> expected %q, got %q", got.ID, expected.ID)
return fmt.Errorf("mismatching RepoDigests -> expected %q, got %q", got.Id, expected.Id)
}
if got.Size != expected.Size {
return fmt.Errorf("mismatching Sizes -> expected %q, got %q", got.ID, expected.ID)
if got.Size_ != expected.Size_ {
return fmt.Errorf("mismatching Sizes -> expected %q, got %q", got.Id, expected.Id)
}
return nil
}
var (
busyboxStr = "busybox"
gibberishStr = "XXXX_GIBBERISH_XXXX"
)
var testImgSpecs = map[string]imageTestCase{
"non-existent-image": {
&container.ImageSpec{
Image: "XXXX_GIBBERISH_XXXX",
&runtimeApi.ImageSpec{
Image: &gibberishStr,
},
nil,
},
"busybox": {
&container.ImageSpec{
Image: "busybox",
&runtimeApi.ImageSpec{
Image: &busyboxStr,
},
&container.Image{
ID: "",
&runtimeApi.Image{
Id: nil,
RepoTags: []string{},
RepoDigests: []string{},
Size: 0,
Size_: nil,
},
},
}
var testAuthConfig = map[string]container.AuthConfig{
var testAuthConfig = map[string]runtimeApi.AuthConfig{
"no-auth": {},
}
func testNewImageStore(t *testing.T, cfg ImageStoreConfig) container.ImageService {
imgStore, err := NewImageStore(cfg)
func testNewImageStore(t *testing.T, cfg ImageStoreConfig) *ImageStore {
s, err := NewImageStore(cfg)
if err != nil {
// TODO(tmrts): Implement stringer for rktshim.ImageStoreConfig for test readability.
t.Fatalf("rktshim.NewImageStore(%s) got error %q", cfg, err)
}
return imgStore
return s
}
func TestPullsImageWithoutAuthentication(t *testing.T) {
@ -196,10 +201,10 @@ func TestListsImages(t *testing.T) {
}
for _, img := range imgs {
expectedImg := *testImgSpecs[img.ID].ExpectedStatus
expectedImg := *testImgSpecs[*img.Id].ExpectedStatus
if err := compareContainerImages(img, expectedImg); err != nil {
t.Errorf("rktshim.ImageStore.List() for %q, %v", img.ID, err)
t.Errorf("rktshim.ImageStore.List() for %q, %v", img.Id, err)
}
}
}