Skip to content

Commit

Permalink
Merge pull request kubevirt#1797 from onesourceintegrations/addip2diskc
Browse files Browse the repository at this point in the history 
Adding IP into registry disk container as a networking test relies on…
  • Loading branch information
@booxter
booxter authored Dec 4, 2018
2 parents 69cb6bb + de28572 commit fff86e5
Show file tree
Hide file tree
Showing 151 changed files with 221 additions and 220 deletions.
3 changes: 2 additions & 1 deletion cmd/container-disk-v1alpha/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ LABEL maintainer="The KubeVirt Project <[email protected]>"

ENV container docker

RUN yum install -y bzip2 qemu-img && dnf clean all && mkdir -p /disk
# TODO: iproute should be removed when tests no longer rely on it
RUN yum install -y bzip2 qemu-img iproute && dnf clean all && mkdir -p /disk

ADD entry-point.sh /

Expand Down
2 changes: 1 addition & 1 deletion cmd/virt-api/virt-api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
_ "kubevirt.io/kubevirt/pkg/monitoring/reflector/prometheus" // import for prometheus metrics
_ "kubevirt.io/kubevirt/pkg/monitoring/workqueue/prometheus" // import for prometheus metrics
"kubevirt.io/kubevirt/pkg/service"
"kubevirt.io/kubevirt/pkg/virt-api"
virt_api "kubevirt.io/kubevirt/pkg/virt-api"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/virt-handler/virt-handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/certificates"
"kubevirt.io/kubevirt/pkg/controller"
"kubevirt.io/kubevirt/pkg/inotify-informer"
inotifyinformer "kubevirt.io/kubevirt/pkg/inotify-informer"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/log"
_ "kubevirt.io/kubevirt/pkg/monitoring/client/prometheus" // import for prometheus metrics
_ "kubevirt.io/kubevirt/pkg/monitoring/reflector/prometheus" // import for prometheus metrics
_ "kubevirt.io/kubevirt/pkg/monitoring/workqueue/prometheus" // import for prometheus metrics
"kubevirt.io/kubevirt/pkg/service"
"kubevirt.io/kubevirt/pkg/util"
"kubevirt.io/kubevirt/pkg/virt-handler"
virthandler "kubevirt.io/kubevirt/pkg/virt-handler"
virtcache "kubevirt.io/kubevirt/pkg/virt-handler/cache"
"kubevirt.io/kubevirt/pkg/virt-launcher"
virtlauncher "kubevirt.io/kubevirt/pkg/virt-launcher"
virt_api "kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/api"
)

Expand Down
14 changes: 7 additions & 7 deletions cmd/virt-launcher/virt-launcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,26 +29,26 @@ import (
"syscall"
"time"

"github.com/libvirt/libvirt-go"
libvirt "github.com/libvirt/libvirt-go"
"github.com/spf13/pflag"
"k8s.io/apimachinery/pkg/types"
utilwait "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"

"kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/cloud-init"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
"kubevirt.io/kubevirt/pkg/config"
containerdisk "kubevirt.io/kubevirt/pkg/container-disk"
"kubevirt.io/kubevirt/pkg/ephemeral-disk"
ephemeraldisk "kubevirt.io/kubevirt/pkg/ephemeral-disk"
"kubevirt.io/kubevirt/pkg/hooks"
"kubevirt.io/kubevirt/pkg/log"
"kubevirt.io/kubevirt/pkg/virt-handler/cmd-client"
"kubevirt.io/kubevirt/pkg/virt-launcher"
cmdclient "kubevirt.io/kubevirt/pkg/virt-handler/cmd-client"
virtlauncher "kubevirt.io/kubevirt/pkg/virt-launcher"
notifyclient "kubevirt.io/kubevirt/pkg/virt-launcher/notify-client"
"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap"
"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/api"
virtcli "kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/cli"
"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/cmd-server"
cmdserver "kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/cmd-server"
"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/util"
"kubevirt.io/kubevirt/pkg/watchdog"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/deepcopy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1
import (
"reflect"

"github.com/google/gofuzz"
fuzz "github.com/google/gofuzz"
. "github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"

"github.com/pborman/uuid"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package v1

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/schema_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
)

type NetworkTemplateConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/types_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"

"kubevirt.io/kubevirt/pkg/log"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud-init/cloud-init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/log"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud-init/cloud-init_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/precond"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config-map.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package config
import (
"path/filepath"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

// GetConfigMapSourcePath returns a path to ConfigMap mounted on a pod
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/config-map_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
. "github.com/onsi/gomega"
k8sv1 "k8s.io/api/core/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var _ = Describe("ConfigMap", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package config
import (
"path/filepath"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

// GetSecretSourcePath returns a path to Secret mounted on a pod
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/secret_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var _ = Describe("Secret", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/service-account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package config
import (
"path/filepath"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

// GetServiceAccountDiskPath returns a path to the ServiceAccount iso image
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/service-account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var _ = Describe("ServiceAccount", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/container-disk/container-disk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
kubev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
"kubevirt.io/kubevirt/pkg/precond"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/container-disk/container-disk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var _ = Describe("ContainerDisk", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/conditions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
k8sv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

type VirtualMachineConditionManager struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/client-go/util/workqueue"

cdiv1 "kubevirt.io/containerized-data-importer/pkg/apis/datavolumecontroller/v1alpha1"
"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/log"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/controller_ref_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sync"
"testing"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/expectations_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"testing"
"time"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/util/rand"
Expand Down
2 changes: 1 addition & 1 deletion pkg/emptydisk/emptydisk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path"
"strconv"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var EmptyDiskBaseDir = "/var/run/libvirt/empty-disks/"
Expand Down
2 changes: 1 addition & 1 deletion pkg/emptydisk/emptydisk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/api/resource"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var _ = Describe("EmptyDisk", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/ephemeral-disk-utils/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"strconv"
"strings"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/log"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ephemeral-disk/ephemeral-disk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"os/exec"
"path/filepath"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ephemeral-disk/ephemeral-disk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
. "github.com/onsi/gomega"
k8sv1 "k8s.io/api/core/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var _ = Describe("ContainerDisk", func() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/healthz/healthz.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"
"net/http"

"github.com/emicklei/go-restful"
restful "github.com/emicklei/go-restful"
"k8s.io/apimachinery/pkg/util/json"

"kubevirt.io/kubevirt/pkg/kubecli"
Expand Down
2 changes: 1 addition & 1 deletion pkg/hooks/hooks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

k8sv1 "k8s.io/api/core/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

const HookSidecarListAnnotationName = "hooks.kubevirt.io/hookSidecars"
Expand Down
2 changes: 1 addition & 1 deletion pkg/hooks/hooks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
. "github.com/onsi/gomega"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/hooks"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/hooks/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

"google.golang.org/grpc"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
hooksInfo "kubevirt.io/kubevirt/pkg/hooks/info"
hooksV1alpha1 "kubevirt.io/kubevirt/pkg/hooks/v1alpha1"
"kubevirt.io/kubevirt/pkg/log"
Expand Down
2 changes: 1 addition & 1 deletion pkg/host-disk/host-disk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

k8sv1 "k8s.io/api/core/v1"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
"kubevirt.io/kubevirt/pkg/util/types"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/host-disk/host-disk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"

"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
"kubevirt.io/kubevirt/pkg/kubecli"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/inotify-informer/inotify.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"sync"

"github.com/fsnotify/fsnotify"
"k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/tools/cache"
Expand Down
2 changes: 1 addition & 1 deletion pkg/inotify-informer/inotify_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubecli/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/url"

"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
k8smetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubecli/kubecli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"k8s.io/client-go/tools/clientcmd"

cdiclient "kubevirt.io/containerized-data-importer/pkg/client/clientset/versioned"
"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubecli/kubevirt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"k8s.io/client-go/rest"

cdiclient "kubevirt.io/containerized-data-importer/pkg/client/clientset/versioned"
"kubevirt.io/kubevirt/pkg/api/v1"
v1 "kubevirt.io/kubevirt/pkg/api/v1"
)

type KubevirtClient interface {
Expand Down
Loading

0 comments on commit fff86e5

Please sign in to comment.