Skip to content

Commit

Permalink
Use kubevirt.io/kubevirt prefix
Browse files Browse the repository at this point in the history
… instead of core.

Change-Id: I1a34210d0081209874df18e0724c0126dd5352a5
Signed-off-by: Fabian Deutsch <[email protected]>
  • Loading branch information
fabiand committed Dec 9, 2016
1 parent 688e8dc commit 0c78be9
Show file tree
Hide file tree
Showing 26 changed files with 51 additions and 51 deletions.
4 changes: 2 additions & 2 deletions cmd/virt-api/virt-api.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/emicklei/go-restful/swagger"
"golang.org/x/net/context"
"k8s.io/client-go/1.5/pkg/api/unversioned"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/virt-api/rest"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/virt-api/rest"
"log"
"net/http"
"strconv"
Expand Down
10 changes: 5 additions & 5 deletions cmd/virt-controller/virt-controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"github.com/emicklei/go-restful"
"github.com/facebookgo/inject"
"k8s.io/client-go/1.5/tools/cache"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/core/pkg/util"
"kubevirt.io/core/pkg/virt-controller/rest"
"kubevirt.io/core/pkg/virt-controller/services"
"kubevirt.io/core/pkg/virt-controller/watch"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/util"
"kubevirt.io/kubevirt/pkg/virt-controller/rest"
"kubevirt.io/kubevirt/pkg/virt-controller/services"
"kubevirt.io/kubevirt/pkg/virt-controller/watch"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions cmd/virt-handler/virt-handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"k8s.io/client-go/1.5/pkg/fields"
"k8s.io/client-go/1.5/pkg/labels"
"k8s.io/client-go/1.5/tools/cache"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/core/pkg/libvirt"
virtcache "kubevirt.io/core/pkg/libvirt/cache"
"kubevirt.io/core/pkg/util"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/libvirt"
virtcache "kubevirt.io/kubevirt/pkg/libvirt/cache"
"kubevirt.io/kubevirt/pkg/util"
"os"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/mapper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/satori/go.uuid"
kubeapi "k8s.io/client-go/1.5/pkg/api"
"k8s.io/client-go/1.5/pkg/types"
"kubevirt.io/core/pkg/api"
"kubevirt.io/kubevirt/pkg/api"
)

var _ = Describe("Mapper", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v1

import (
"encoding/xml"
"kubevirt.io/core/pkg/precond"
"kubevirt.io/kubevirt/pkg/precond"
)

type DomainSpec struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/client-go/1.5/pkg/api/v1"
"k8s.io/client-go/1.5/pkg/apimachinery/announced"
"k8s.io/client-go/1.5/pkg/runtime"
"kubevirt.io/core/pkg/api"
"kubevirt.io/kubevirt/pkg/api"
"reflect"
)

Expand All @@ -37,7 +37,7 @@ func init() {
&announced.GroupMetaFactoryArgs{
GroupName: GroupName,
VersionPreferenceOrder: []string{GroupVersion.Version},
ImportPrefix: "kubevirt.io/core/pgk/api/v1",
ImportPrefix: "kubevirt.io/kubevirt/pgk/api/v1",
},
announced.VersionToSchemeFunc{
GroupVersion.Version: SchemeBuilder.AddToScheme,
Expand Down
2 changes: 1 addition & 1 deletion pkg/healthz/healthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"github.com/emicklei/go-restful"
"k8s.io/client-go/1.5/pkg/util/json"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/kubecli"
"net/http"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubecli/kubecli.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"k8s.io/client-go/1.5/rest"
"k8s.io/client-go/1.5/tools/cache"
"k8s.io/client-go/1.5/tools/clientcmd"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/api/v1"
"runtime/debug"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/libvirt/cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"k8s.io/client-go/1.5/pkg/types"
"k8s.io/client-go/1.5/pkg/watch"
"k8s.io/client-go/1.5/tools/cache"
kubevirt "kubevirt.io/core/pkg/libvirt"
kubevirt "kubevirt.io/kubevirt/pkg/libvirt"
)

// NewListWatchFromClient creates a new ListWatch from the specified client, resource, namespace and field selector.
Expand Down
6 changes: 3 additions & 3 deletions pkg/libvirt/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"k8s.io/client-go/1.5/pkg/api"
"k8s.io/client-go/1.5/pkg/api/meta"
"k8s.io/client-go/1.5/pkg/api/unversioned"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/precond"
"kubevirt.io/core/pkg/util"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/precond"
"kubevirt.io/kubevirt/pkg/util"
)

type LifeCycle string
Expand Down
2 changes: 1 addition & 1 deletion pkg/libvirt/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/rmohr/go-model"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/api/v1"
)

var exampleXML = `
Expand Down
2 changes: 1 addition & 1 deletion pkg/middleware/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/levels"
"kubevirt.io/core/pkg/precond"
"kubevirt.io/kubevirt/pkg/precond"
)

type AppError interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/middleware/middleware_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"golang.org/x/net/context"
"kubevirt.io/core/pkg/precond"
"kubevirt.io/kubevirt/pkg/precond"
)

var _ = Describe("Middleware", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/rest/endpoints/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/go-kit/kit/endpoint"
kithttp "github.com/go-kit/kit/transport/http"
"kubevirt.io/core/pkg/precond"
"kubevirt.io/kubevirt/pkg/precond"
)

type HandlerBuilder interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/rest/endpoints/encoders.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package endpoints
import (
"encoding/json"
"golang.org/x/net/context"
"kubevirt.io/core/pkg/middleware"
"kubevirt.io/kubevirt/pkg/middleware"
"net/http"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/util/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"k8s.io/client-go/1.5/pkg/api"
"k8s.io/client-go/1.5/pkg/fields"
"k8s.io/client-go/1.5/tools/cache"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
)

func NewVMCache() (cache.SharedInformer, error) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/virt-api/rest/kubeproxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"k8s.io/client-go/1.5/pkg/api/unversioned"
"k8s.io/client-go/1.5/pkg/runtime"
"k8s.io/client-go/1.5/rest"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/core/pkg/middleware"
"kubevirt.io/core/pkg/rest/endpoints"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/middleware"
"kubevirt.io/kubevirt/pkg/rest/endpoints"
"reflect"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/virt-api/rest/rest.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package rest

import (
"github.com/emicklei/go-restful"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/healthz"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/healthz"
)

var WebService *restful.WebService
Expand Down
2 changes: 1 addition & 1 deletion pkg/virt-controller/rest/rest.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package rest

import (
"github.com/emicklei/go-restful"
"kubevirt.io/core/pkg/healthz"
"kubevirt.io/kubevirt/pkg/healthz"
)

var WebService *restful.WebService
Expand Down
4 changes: 2 additions & 2 deletions pkg/virt-controller/services/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/go-kit/kit/log/levels"
"io"
"k8s.io/client-go/1.5/pkg/types"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/precond"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/precond"
"text/template"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/virt-controller/services/template_test.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package services_test

import (
. "kubevirt.io/core/pkg/virt-controller/services"
. "kubevirt.io/kubevirt/pkg/virt-controller/services"

"bytes"
"github.com/go-kit/kit/log"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
kubeapi "k8s.io/client-go/1.5/pkg/api"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/api/v1"
"os"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/virt-controller/services/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"k8s.io/client-go/1.5/pkg/fields"
"k8s.io/client-go/1.5/pkg/labels"
"k8s.io/client-go/1.5/pkg/util/yaml"
corev1 "kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/middleware"
"kubevirt.io/core/pkg/precond"
corev1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/middleware"
"kubevirt.io/kubevirt/pkg/precond"
)

type VMService interface {
Expand Down
4 changes: 2 additions & 2 deletions pkg/virt-controller/watch/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"k8s.io/client-go/1.5/pkg/types"
"k8s.io/client-go/1.5/rest"
"k8s.io/client-go/1.5/tools/cache"
corev1 "kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/kubecli"
corev1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
)

func NewPodResourceEventHandler(logger log.Logger) (kubecli.ResourceEventHandler, error) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/virt-controller/watch/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"k8s.io/client-go/1.5/pkg/fields"
"k8s.io/client-go/1.5/rest"
"k8s.io/client-go/1.5/tools/cache"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/core/pkg/virt-controller/services"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/virt-controller/services"
)

type vmResourceEventHandler struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/virt-controller/watch/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"k8s.io/client-go/1.5/pkg/api/unversioned"
"k8s.io/client-go/1.5/pkg/fields"
"k8s.io/client-go/1.5/tools/cache"
"kubevirt.io/core/pkg/api/v1"
"kubevirt.io/core/pkg/kubecli"
"kubevirt.io/core/pkg/virt-controller/services"
"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/virt-controller/services"
)

type VMWatcher interface {
Expand Down
2 changes: 1 addition & 1 deletion vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -301,5 +301,5 @@
"versionExact": "v1.5.0"
}
],
"rootPath": "kubevirt.io/core"
"rootPath": "kubevirt.io/kubevirt"
}

0 comments on commit 0c78be9

Please sign in to comment.