From 81faa8bc8954061f1bdfbd3c5ef44e9050970d45 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 10 Aug 2017 16:11:41 -0400 Subject: [PATCH] Rename libkpod to libpod Signed-off-by: Matthew Heon --- cmd/crio/main.go | 14 +++++++------- cmd/kpod/common.go | 8 ++++---- cmd/kpod/history.go | 2 +- cmd/kpod/images.go | 12 ++++++------ cmd/kpod/inspect.go | 10 +++++----- cmd/kpod/load.go | 6 +++--- cmd/kpod/pull.go | 6 +++--- cmd/kpod/push.go | 8 ++++---- cmd/kpod/rmi.go | 14 +++++++------- cmd/kpod/save.go | 6 +++--- cmd/kpod/tag.go | 4 ++-- {libkpod => libpod}/common/common.go | 0 .../common/docker_registry_options.go | 0 {libkpod => libpod}/common/signing_options.go | 0 {libkpod => libpod}/config.go | 4 ++-- {libkpod => libpod}/container.go | 4 ++-- {libkpod => libpod}/container_data.go | 8 ++++---- {libkpod => libpod}/container_server.go | 4 ++-- {libkpod => libpod}/driver/driver.go | 0 {libkpod => libpod}/image/copy.go | 2 +- {libkpod => libpod}/image/copy_data.go | 2 +- {libkpod => libpod}/image/copy_ref.go | 0 {libkpod => libpod}/image/image.go | 2 +- {libkpod => libpod}/image/image_data.go | 2 +- {libkpod => libpod}/image/rmi.go | 0 {libkpod => libpod}/sandbox/sandbox.go | 0 server/config.go | 16 ++++++++-------- server/container_create.go | 10 +++++----- server/sandbox_list.go | 2 +- server/sandbox_remove.go | 2 +- server/sandbox_run.go | 2 +- server/sandbox_stop.go | 2 +- server/server.go | 8 ++++---- 33 files changed, 80 insertions(+), 80 deletions(-) rename {libkpod => libpod}/common/common.go (100%) rename {libkpod => libpod}/common/docker_registry_options.go (100%) rename {libkpod => libpod}/common/signing_options.go (100%) rename {libkpod => libpod}/config.go (99%) rename {libkpod => libpod}/container.go (98%) rename {libkpod => libpod}/container_data.go (95%) rename {libkpod => libpod}/container_server.go (99%) rename {libkpod => libpod}/driver/driver.go (100%) rename {libkpod => libpod}/image/copy.go (99%) rename {libkpod => libpod}/image/copy_data.go (99%) rename {libkpod => libpod}/image/copy_ref.go (100%) rename {libkpod => libpod}/image/image.go (99%) rename {libkpod => libpod}/image/image_data.go (98%) rename {libkpod => libpod}/image/rmi.go (100%) rename {libkpod => libpod}/sandbox/sandbox.go (100%) diff --git a/cmd/crio/main.go b/cmd/crio/main.go index 71d83d5a..e44b537d 100644 --- a/cmd/crio/main.go +++ b/cmd/crio/main.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/containers/storage/pkg/reexec" - "github.com/kubernetes-incubator/cri-o/libkpod" + "github.com/kubernetes-incubator/cri-o/libpod" "github.com/kubernetes-incubator/cri-o/server" "github.com/opencontainers/selinux/go-selinux" "github.com/sirupsen/logrus" @@ -25,9 +25,9 @@ const crioConfigPath = "/etc/crio/crio.conf" func validateConfig(config *server.Config) error { switch config.ImageVolumes { - case libkpod.ImageVolumesMkdir: - case libkpod.ImageVolumesIgnore: - case libkpod.ImageVolumesBind: + case libpod.ImageVolumesMkdir: + case libpod.ImageVolumesIgnore: + case libpod.ImageVolumesBind: default: return fmt.Errorf("Unrecognized image volume type specified") @@ -121,7 +121,7 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error { config.PluginDir = ctx.GlobalString("cni-plugin-dir") } if ctx.GlobalIsSet("image-volumes") { - config.ImageVolumes = libkpod.ImageVolumesType(ctx.GlobalString("image-volumes")) + config.ImageVolumes = libpod.ImageVolumesType(ctx.GlobalString("image-volumes")) } return nil } @@ -260,7 +260,7 @@ func main() { }, cli.Int64Flag{ Name: "pids-limit", - Value: libkpod.DefaultPidsLimit, + Value: libpod.DefaultPidsLimit, Usage: "maximum number of processes allowed in a container", }, cli.StringFlag{ @@ -273,7 +273,7 @@ func main() { }, cli.StringFlag{ Name: "image-volumes", - Value: string(libkpod.ImageVolumesMkdir), + Value: string(libpod.ImageVolumesMkdir), Usage: "image volume handling ('mkdir' or 'ignore')", }, cli.BoolFlag{ diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go index 0b399c6a..4fdcc005 100644 --- a/cmd/kpod/common.go +++ b/cmd/kpod/common.go @@ -3,11 +3,11 @@ package main import ( is "github.com/containers/image/storage" "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod" + "github.com/kubernetes-incubator/cri-o/libpod" "github.com/urfave/cli" ) -func getStore(c *libkpod.Config) (storage.Store, error) { +func getStore(c *libpod.Config) (storage.Store, error) { options := storage.DefaultStoreOptions options.GraphRoot = c.Root options.RunRoot = c.RunRoot @@ -22,8 +22,8 @@ func getStore(c *libkpod.Config) (storage.Store, error) { return store, nil } -func getConfig(c *cli.Context) (*libkpod.Config, error) { - config := libkpod.DefaultConfig() +func getConfig(c *cli.Context) (*libpod.Config, error) { + config := libpod.DefaultConfig() if c.GlobalIsSet("config") { err := config.UpdateFromFile(c.String("config")) if err != nil { diff --git a/cmd/kpod/history.go b/cmd/kpod/history.go index 082e6d66..57864e78 100644 --- a/cmd/kpod/history.go +++ b/cmd/kpod/history.go @@ -14,7 +14,7 @@ import ( is "github.com/containers/image/storage" "github.com/containers/storage" units "github.com/docker/go-units" - "github.com/kubernetes-incubator/cri-o/libkpod/common" + "github.com/kubernetes-incubator/cri-o/libpod/common" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli" diff --git a/cmd/kpod/images.go b/cmd/kpod/images.go index 1c073748..f9885111 100644 --- a/cmd/kpod/images.go +++ b/cmd/kpod/images.go @@ -6,7 +6,7 @@ import ( "text/template" "github.com/containers/storage" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" "github.com/urfave/cli" @@ -99,9 +99,9 @@ func imagesCmd(c *cli.Context) error { return errors.New("'buildah images' requires at most 1 argument") } - var params *libkpodimage.FilterParams + var params *libpodimage.FilterParams if c.IsSet("filter") { - params, err = libkpodimage.ParseFilter(store, c.String("filter")) + params, err = libpodimage.ParseFilter(store, c.String("filter")) if err != nil { return errors.Wrapf(err, "error parsing filter") } @@ -109,7 +109,7 @@ func imagesCmd(c *cli.Context) error { params = nil } - imageList, err := libkpodimage.GetImagesMatchingFilter(store, params, name) + imageList, err := libpodimage.GetImagesMatchingFilter(store, params, name) if err != nil { return errors.Wrapf(err, "could not get list of images matching filter") } @@ -143,7 +143,7 @@ func outputImages(store storage.Store, images []storage.Image, format string, ha name = img.Names[0] } - info, digest, size, _ := libkpodimage.InfoAndDigestAndSize(store, img) + info, digest, size, _ := libpodimage.InfoAndDigestAndSize(store, img) if info != nil { createdTime = info.Created } @@ -159,7 +159,7 @@ func outputImages(store storage.Store, images []storage.Image, format string, ha Name: name, Digest: digest, CreatedAt: createdTime.Format("Jan 2, 2006 15:04"), - Size: libkpodimage.FormattedSize(size), + Size: libpodimage.FormattedSize(size), } if hasTemplate { if err := outputUsingTemplate(format, params); err != nil { diff --git a/cmd/kpod/inspect.go b/cmd/kpod/inspect.go index c973c4ad..78164ed5 100644 --- a/cmd/kpod/inspect.go +++ b/cmd/kpod/inspect.go @@ -6,8 +6,8 @@ import ( "os" "text/template" - "github.com/kubernetes-incubator/cri-o/libkpod" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + "github.com/kubernetes-incubator/cri-o/libpod" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -81,7 +81,7 @@ func inspectCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "Could not get config") } - server, err := libkpod.New(config) + server, err := libpod.New(config) if err != nil { return errors.Wrapf(err, "could not get container server") } @@ -97,14 +97,14 @@ func inspectCmd(c *cli.Context) error { return errors.Wrapf(err, "error parsing container data") } case inspectTypeImage: - data, err = libkpodimage.GetImageData(server.Store(), name) + data, err = libpodimage.GetImageData(server.Store(), name) if err != nil { return errors.Wrapf(err, "error parsing image data") } case inspectAll: ctrData, err := server.GetContainerData(name, size) if err != nil { - imgData, err := libkpodimage.GetImageData(server.Store(), name) + imgData, err := libpodimage.GetImageData(server.Store(), name) if err != nil { return errors.Wrapf(err, "error parsing container or image data") } diff --git a/cmd/kpod/load.go b/cmd/kpod/load.go index 6c2eea53..8dfa8c34 100644 --- a/cmd/kpod/load.go +++ b/cmd/kpod/load.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod/common" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + "github.com/kubernetes-incubator/cri-o/libpod/common" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -105,5 +105,5 @@ func loadImage(store storage.Store, opts loadOptions) error { src := dockerArchive + opts.input - return libkpodimage.PullImage(store, src, false, opts.quiet, systemContext) + return libpodimage.PullImage(store, src, false, opts.quiet, systemContext) } diff --git a/cmd/kpod/pull.go b/cmd/kpod/pull.go index 89f74ee3..c4bfe8c7 100644 --- a/cmd/kpod/pull.go +++ b/cmd/kpod/pull.go @@ -1,8 +1,8 @@ package main import ( - "github.com/kubernetes-incubator/cri-o/libkpod/common" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + "github.com/kubernetes-incubator/cri-o/libpod/common" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -58,7 +58,7 @@ func pullCmd(c *cli.Context) error { systemContext := common.GetSystemContext("") - err = libkpodimage.PullImage(store, image, allTags, false, systemContext) + err = libpodimage.PullImage(store, image, allTags, false, systemContext) if err != nil { return errors.Errorf("error pulling image from %q: %v", image, err) } diff --git a/cmd/kpod/push.go b/cmd/kpod/push.go index 43ab18e3..f2d851f7 100644 --- a/cmd/kpod/push.go +++ b/cmd/kpod/push.go @@ -6,8 +6,8 @@ import ( "github.com/containers/image/types" "github.com/containers/storage/pkg/archive" - "github.com/kubernetes-incubator/cri-o/libkpod/common" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + "github.com/kubernetes-incubator/cri-o/libpod/common" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" @@ -112,7 +112,7 @@ func pushCmd(c *cli.Context) error { return err } - options := libkpodimage.CopyOptions{ + options := libpodimage.CopyOptions{ Compression: compress, SignaturePolicyPath: signaturePolicy, Store: store, @@ -129,5 +129,5 @@ func pushCmd(c *cli.Context) error { if !c.Bool("quiet") { options.ReportWriter = os.Stderr } - return libkpodimage.PushImage(srcName, destName, options) + return libpodimage.PushImage(srcName, destName, options) } diff --git a/cmd/kpod/rmi.go b/cmd/kpod/rmi.go index c7752fc1..5249c483 100644 --- a/cmd/kpod/rmi.go +++ b/cmd/kpod/rmi.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/containers/storage" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -49,7 +49,7 @@ func rmiCmd(c *cli.Context) error { } for _, id := range args { - image, err := libkpodimage.FindImage(store, id) + image, err := libpodimage.FindImage(store, id) if err != nil { return errors.Wrapf(err, "could not get image %q", id) } @@ -68,14 +68,14 @@ func rmiCmd(c *cli.Context) error { } } // If the user supplied an ID, we cannot delete the image if it is referred to by multiple tags - if libkpodimage.MatchesID(image.ID, id) { + if libpodimage.MatchesID(image.ID, id) { if len(image.Names) > 1 && !force { return fmt.Errorf("unable to delete %s (must force) - image is referred to in multiple tags", image.ID) } // If it is forced, we have to untag the image so that it can be deleted image.Names = image.Names[:0] } else { - name, err2 := libkpodimage.UntagImage(store, image, id) + name, err2 := libpodimage.UntagImage(store, image, id) if err2 != nil { return err } @@ -85,7 +85,7 @@ func rmiCmd(c *cli.Context) error { if len(image.Names) > 0 { continue } - id, err := libkpodimage.RemoveImage(image, store) + id, err := libpodimage.RemoveImage(image, store) if err != nil { return err } @@ -97,7 +97,7 @@ func rmiCmd(c *cli.Context) error { } // Returns a list of running containers associated with the given ImageReference -// TODO: replace this with something in libkpod +// TODO: replace this with something in libpod func runningContainers(image *storage.Image, store storage.Store) ([]string, error) { ctrIDs := []string{} containers, err := store.Containers() @@ -112,7 +112,7 @@ func runningContainers(image *storage.Image, store storage.Store) ([]string, err return ctrIDs, nil } -// TODO: replace this with something in libkpod +// TODO: replace this with something in libpod func removeContainers(ctrIDs []string, store storage.Store) error { for _, ctrID := range ctrIDs { if err := store.DeleteContainer(ctrID); err != nil { diff --git a/cmd/kpod/save.go b/cmd/kpod/save.go index 8c7edcfb..fd75dce5 100644 --- a/cmd/kpod/save.go +++ b/cmd/kpod/save.go @@ -4,7 +4,7 @@ import ( "os" "github.com/containers/storage" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli" @@ -83,7 +83,7 @@ func saveCmd(c *cli.Context) error { func saveImage(store storage.Store, opts saveOptions) error { dst := dockerArchive + opts.output - pushOpts := libkpodimage.CopyOptions{ + pushOpts := libpodimage.CopyOptions{ SignaturePolicyPath: "", Store: store, } @@ -92,7 +92,7 @@ func saveImage(store storage.Store, opts saveOptions) error { // future pull requests will fix this for _, image := range opts.images { dest := dst + ":" + image - if err := libkpodimage.PushImage(image, dest, pushOpts); err != nil { + if err := libpodimage.PushImage(image, dest, pushOpts); err != nil { return errors.Wrapf(err, "unable to save %q", image) } } diff --git a/cmd/kpod/tag.go b/cmd/kpod/tag.go index c691dd0e..2e69134f 100644 --- a/cmd/kpod/tag.go +++ b/cmd/kpod/tag.go @@ -3,7 +3,7 @@ package main import ( "github.com/containers/image/docker/reference" "github.com/containers/storage" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -32,7 +32,7 @@ func tagCmd(c *cli.Context) error { if err != nil { return err } - img, err := libkpodimage.FindImage(store, args[0]) + img, err := libpodimage.FindImage(store, args[0]) if err != nil { return err } diff --git a/libkpod/common/common.go b/libpod/common/common.go similarity index 100% rename from libkpod/common/common.go rename to libpod/common/common.go diff --git a/libkpod/common/docker_registry_options.go b/libpod/common/docker_registry_options.go similarity index 100% rename from libkpod/common/docker_registry_options.go rename to libpod/common/docker_registry_options.go diff --git a/libkpod/common/signing_options.go b/libpod/common/signing_options.go similarity index 100% rename from libkpod/common/signing_options.go rename to libpod/common/signing_options.go diff --git a/libkpod/config.go b/libpod/config.go similarity index 99% rename from libkpod/config.go rename to libpod/config.go index a6b276d3..0539b5c9 100644 --- a/libkpod/config.go +++ b/libpod/config.go @@ -1,4 +1,4 @@ -package libkpod +package libpod import ( "bytes" @@ -77,7 +77,7 @@ type RootConfig struct { LogDir string `toml:"log_dir"` // FileLocking specifies whether to use file-based or in-memory locking - // File-based locking is required when multiple users of libkpod are + // File-based locking is required when multiple users of libpod are // present on the same system FileLocking bool `toml:"file_locking"` } diff --git a/libkpod/container.go b/libpod/container.go similarity index 98% rename from libkpod/container.go rename to libpod/container.go index 7835952d..643065e0 100644 --- a/libkpod/container.go +++ b/libpod/container.go @@ -1,10 +1,10 @@ -package libkpod +package libpod import ( "fmt" cstorage "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/kubernetes-incubator/cri-o/pkg/registrar" "github.com/pkg/errors" diff --git a/libkpod/container_data.go b/libpod/container_data.go similarity index 95% rename from libkpod/container_data.go rename to libpod/container_data.go index 2368eb3f..15d2c6af 100644 --- a/libkpod/container_data.go +++ b/libpod/container_data.go @@ -1,4 +1,4 @@ -package libkpod +package libpod import ( "encoding/json" @@ -7,8 +7,8 @@ import ( "k8s.io/apimachinery/pkg/fields" pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime" - "github.com/kubernetes-incubator/cri-o/libkpod/driver" - libkpodimage "github.com/kubernetes-incubator/cri-o/libkpod/image" + "github.com/kubernetes-incubator/cri-o/libpod/driver" + libpodimage "github.com/kubernetes-incubator/cri-o/libpod/image" "github.com/kubernetes-incubator/cri-o/oci" "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" @@ -77,7 +77,7 @@ func (c *ContainerServer) GetContainerData(name string, size bool) (*ContainerDa if container.ImageID == "" { return nil, errors.Errorf("error reading container image data: container is not based on an image") } - imageData, err := libkpodimage.GetImageData(c.store, container.ImageID) + imageData, err := libpodimage.GetImageData(c.store, container.ImageID) if err != nil { return nil, errors.Wrapf(err, "error reading container image data") } diff --git a/libkpod/container_server.go b/libpod/container_server.go similarity index 99% rename from libkpod/container_server.go rename to libpod/container_server.go index c3535e9b..c4fe3e80 100644 --- a/libkpod/container_server.go +++ b/libpod/container_server.go @@ -1,4 +1,4 @@ -package libkpod +package libpod import ( "encoding/json" @@ -12,7 +12,7 @@ import ( cstorage "github.com/containers/storage" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/truncindex" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/kubernetes-incubator/cri-o/pkg/annotations" "github.com/kubernetes-incubator/cri-o/pkg/registrar" diff --git a/libkpod/driver/driver.go b/libpod/driver/driver.go similarity index 100% rename from libkpod/driver/driver.go rename to libpod/driver/driver.go diff --git a/libkpod/image/copy.go b/libpod/image/copy.go similarity index 99% rename from libkpod/image/copy.go rename to libpod/image/copy.go index 7b61dcb6..c2004f3d 100644 --- a/libkpod/image/copy.go +++ b/libpod/image/copy.go @@ -15,7 +15,7 @@ import ( "github.com/containers/image/types" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" - "github.com/kubernetes-incubator/cri-o/libkpod/common" + "github.com/kubernetes-incubator/cri-o/libpod/common" "github.com/pkg/errors" ) diff --git a/libkpod/image/copy_data.go b/libpod/image/copy_data.go similarity index 99% rename from libkpod/image/copy_data.go rename to libpod/image/copy_data.go index eadc6621..bed9fdb0 100644 --- a/libkpod/image/copy_data.go +++ b/libpod/image/copy_data.go @@ -16,7 +16,7 @@ import ( "github.com/containers/storage/pkg/archive" "github.com/docker/docker/pkg/ioutils" "github.com/kubernetes-incubator/cri-o/cmd/kpod/docker" - "github.com/kubernetes-incubator/cri-o/libkpod/common" + "github.com/kubernetes-incubator/cri-o/libpod/common" digest "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go/v1" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/libkpod/image/copy_ref.go b/libpod/image/copy_ref.go similarity index 100% rename from libkpod/image/copy_ref.go rename to libpod/image/copy_ref.go diff --git a/libkpod/image/image.go b/libpod/image/image.go similarity index 99% rename from libkpod/image/image.go rename to libpod/image/image.go index 1d91fb98..c9069871 100644 --- a/libkpod/image/image.go +++ b/libpod/image/image.go @@ -9,7 +9,7 @@ import ( "github.com/containers/image/transports" "github.com/containers/image/types" "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod/common" + "github.com/kubernetes-incubator/cri-o/libpod/common" digest "github.com/opencontainers/go-digest" "github.com/pkg/errors" ) diff --git a/libkpod/image/image_data.go b/libpod/image/image_data.go similarity index 98% rename from libkpod/image/image_data.go rename to libpod/image/image_data.go index 8945b1b5..2b7204d5 100644 --- a/libkpod/image/image_data.go +++ b/libpod/image/image_data.go @@ -7,7 +7,7 @@ import ( "github.com/containers/image/docker/reference" "github.com/containers/image/transports" "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod/driver" + "github.com/kubernetes-incubator/cri-o/libpod/driver" digest "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" diff --git a/libkpod/image/rmi.go b/libpod/image/rmi.go similarity index 100% rename from libkpod/image/rmi.go rename to libpod/image/rmi.go diff --git a/libkpod/sandbox/sandbox.go b/libpod/sandbox/sandbox.go similarity index 100% rename from libkpod/sandbox/sandbox.go rename to libpod/sandbox/sandbox.go diff --git a/server/config.go b/server/config.go index 53a46ecd..afd42514 100644 --- a/server/config.go +++ b/server/config.go @@ -5,13 +5,13 @@ import ( "io/ioutil" "github.com/BurntSushi/toml" - "github.com/kubernetes-incubator/cri-o/libkpod" + "github.com/kubernetes-incubator/cri-o/libpod" ) // Config represents the entire set of configuration values that can be set for // the server. This is intended to be loaded from a toml-encoded config file. type Config struct { - libkpod.Config + libpod.Config APIConfig } @@ -34,11 +34,11 @@ type APIConfig struct { // conversions. type tomlConfig struct { Crio struct { - libkpod.RootConfig - API struct{ APIConfig } `toml:"api"` - Runtime struct{ libkpod.RuntimeConfig } `toml:"runtime"` - Image struct{ libkpod.ImageConfig } `toml:"image"` - Network struct{ libkpod.NetworkConfig } `toml:"network"` + libpod.RootConfig + API struct{ APIConfig } `toml:"api"` + Runtime struct{ libpod.RuntimeConfig } `toml:"runtime"` + Image struct{ libpod.ImageConfig } `toml:"image"` + Network struct{ libpod.NetworkConfig } `toml:"network"` } `toml:"crio"` } @@ -99,7 +99,7 @@ func (c *Config) ToFile(path string) error { // DefaultConfig returns the default configuration for crio. func DefaultConfig() *Config { return &Config{ - Config: *libkpod.DefaultConfig(), + Config: *libpod.DefaultConfig(), APIConfig: APIConfig{ Listen: "/var/run/crio.sock", StreamAddress: "", diff --git a/server/container_create.go b/server/container_create.go index 9e49d718..ed6f7452 100644 --- a/server/container_create.go +++ b/server/container_create.go @@ -13,8 +13,8 @@ import ( "github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/symlink" - "github.com/kubernetes-incubator/cri-o/libkpod" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/kubernetes-incubator/cri-o/pkg/annotations" "github.com/kubernetes-incubator/cri-o/pkg/storage" @@ -83,11 +83,11 @@ func addImageVolumes(rootfs string, s *Server, containerInfo *storage.ContainerI return err } switch s.config.ImageVolumes { - case libkpod.ImageVolumesMkdir: + case libpod.ImageVolumesMkdir: if err1 := os.MkdirAll(fp, 0644); err1 != nil { return err1 } - case libkpod.ImageVolumesBind: + case libpod.ImageVolumesBind: volumeDirName := stringid.GenerateNonCryptoID() src := filepath.Join(containerInfo.RunDir, "mounts", volumeDirName) if err1 := os.MkdirAll(src, 0644); err1 != nil { @@ -102,7 +102,7 @@ func addImageVolumes(rootfs string, s *Server, containerInfo *storage.ContainerI logrus.Debugf("Adding bind mounted volume: %s to %s", src, dest) specgen.AddBindMount(src, dest, []string{"rw"}) - case libkpod.ImageVolumesIgnore: + case libpod.ImageVolumesIgnore: logrus.Debugf("Ignoring volume %v", dest) default: logrus.Fatalf("Unrecognized image volumes setting") diff --git a/server/sandbox_list.go b/server/sandbox_list.go index 3e0044cf..6499b1ec 100644 --- a/server/sandbox_list.go +++ b/server/sandbox_list.go @@ -1,7 +1,7 @@ package server import ( - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/sirupsen/logrus" "golang.org/x/net/context" diff --git a/server/sandbox_remove.go b/server/sandbox_remove.go index e72e1b26..c93946dd 100644 --- a/server/sandbox_remove.go +++ b/server/sandbox_remove.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" pkgstorage "github.com/kubernetes-incubator/cri-o/pkg/storage" "github.com/pkg/errors" diff --git a/server/sandbox_run.go b/server/sandbox_run.go index 8ee1e054..1728472b 100644 --- a/server/sandbox_run.go +++ b/server/sandbox_run.go @@ -12,7 +12,7 @@ import ( "time" "github.com/containers/storage" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/kubernetes-incubator/cri-o/pkg/annotations" "github.com/opencontainers/runc/libcontainer/cgroups/systemd" diff --git a/server/sandbox_stop.go b/server/sandbox_stop.go index 7687272b..c66f600d 100644 --- a/server/sandbox_stop.go +++ b/server/sandbox_stop.go @@ -7,7 +7,7 @@ import ( "github.com/containers/storage" "github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/symlink" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/server/server.go b/server/server.go index 482d67e3..37b32215 100644 --- a/server/server.go +++ b/server/server.go @@ -9,8 +9,8 @@ import ( "os" "sync" - "github.com/kubernetes-incubator/cri-o/libkpod" - "github.com/kubernetes-incubator/cri-o/libkpod/sandbox" + "github.com/kubernetes-incubator/cri-o/libpod" + "github.com/kubernetes-incubator/cri-o/libpod/sandbox" "github.com/kubernetes-incubator/cri-o/oci" "github.com/kubernetes-incubator/cri-o/pkg/ocicni" "github.com/kubernetes-incubator/cri-o/pkg/storage" @@ -47,7 +47,7 @@ type streamService struct { // Server implements the RuntimeService and ImageService type Server struct { - *libkpod.ContainerServer + *libpod.ContainerServer config Config updateLock sync.RWMutex @@ -148,7 +148,7 @@ func New(config *Config) (*Server, error) { if err := os.MkdirAll("/var/run/crio", 0755); err != nil { return nil, err } - containerServer, err := libkpod.New(&config.Config) + containerServer, err := libpod.New(&config.Config) if err != nil { return nil, err }