Skip to content

Commit

Permalink
Remove the cdi-http-image-server container
Browse files Browse the repository at this point in the history
No tests requires now nginx or iscsi which allows to romve the whole
container from the project.

The iscsi rpm dependencies were pulling in `device-mapper` and
`util-linux` packages which are not pulled explicitly into the base
testing image since some tests require them.

Signed-off-by: Roman Mohr <rmohr@redhat.com>
  • Loading branch information
rmohr committed Sep 30, 2021
1 parent 90d30db commit 1c1d511
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 1,444 deletions.
1 change: 0 additions & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ container_bundle(
"$(container_prefix)/$(image_prefix)fedora-with-test-tooling-container-disk:$(container_tag)": "//containerimages:fedora-with-test-tooling",
# testing images
"$(container_prefix)/$(image_prefix)disks-images-provider:$(container_tag)": "//images/disks-images-provider:disks-images-provider-image",
"$(container_prefix)/$(image_prefix)cdi-http-import-server:$(container_tag)": "//images/cdi-http-import-server:cdi-http-import-server-image",
"$(container_prefix)/$(image_prefix)nfs-server:$(container_tag)": "//images/nfs-server:nfs-server-image",
"$(container_prefix)/$(image_prefix)vm-killer:$(container_tag)": "//images/vm-killer:vm-killer-image",
"$(container_prefix)/$(image_prefix)winrmcli:$(container_tag)": "//images/winrmcli:winrmcli-image",
Expand Down
1,080 changes: 0 additions & 1,080 deletions WORKSPACE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/vm-alpine-datavolume.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
storageClassName: local
source:
http:
url: http://cdi-http-import-server.kubevirt/images/alpine.iso
url: docker://registry:5000/kubevirt/alpine-container-disk-demo:devel
running: false
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion hack/config-default.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
binaries="cmd/virt-operator cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virtctl cmd/fake-qemu-process cmd/virt-api cmd/subresource-access-test cmd/example-hook-sidecar cmd/example-cloudinit-hook-sidecar cmd/virt-chroot"
docker_images="cmd/virt-operator cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api images/disks-images-provider images/vm-killer images/nfs-server cmd/subresource-access-test images/winrmcli cmd/example-hook-sidecar cmd/example-cloudinit-hook-sidecar images/cdi-http-import-server tests/conformance"
docker_images="cmd/virt-operator cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api images/disks-images-provider images/vm-killer images/nfs-server cmd/subresource-access-test images/winrmcli cmd/example-hook-sidecar cmd/example-cloudinit-hook-sidecar tests/conformance"
docker_tag=${DOCKER_TAG:-latest}
docker_tag_alt=${DOCKER_TAG_ALT}
image_prefix=${IMAGE_PREFIX}
Expand Down
12 changes: 6 additions & 6 deletions hack/rpm-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ bazel run \
$basesystem \
qemu-img \
which \
nginx \
scsi-target-utils \
procps-ng \
nmap-ncat \
iputils \
e2fsprogs
e2fsprogs \
device-mapper \
util-linux

bazel run \
--config=${ARCHITECTURE} \
//:bazeldnf -- rpmtree --public --arch=aarch64 --name testimage_aarch64 \
$basesystem \
qemu-img \
which \
nginx \
scsi-target-utils \
procps-ng \
nmap-ncat \
iputils \
e2fsprogs
e2fsprogs \
device-mapper \
util-linux

# create a rpmtree for libvirt-devel. libvirt-devel is needed for compilation and unit-testing.
bazel run \
Expand Down
78 changes: 0 additions & 78 deletions images/cdi-http-import-server/BUILD.bazel

This file was deleted.

59 changes: 0 additions & 59 deletions images/cdi-http-import-server/entrypoint.sh

This file was deleted.

45 changes: 0 additions & 45 deletions images/cdi-http-import-server/expose-as-iscsi.sh

This file was deleted.

15 changes: 0 additions & 15 deletions images/cdi-http-import-server/nginx.conf

This file was deleted.

48 changes: 0 additions & 48 deletions manifests/testing/disks-images-provider.yaml.in
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
---
apiVersion: v1
kind: Service
metadata:
name: cdi-http-import-server
namespace: {{.Namespace}}
labels:
kubevirt.io: "cdi-http-import-server"
spec:
ports:
- port: 80
targetPort: 80
protocol: TCP
selector:
kubevirt.io: cdi-http-import-server
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: cdi-http-import-server
namespace: {{.Namespace}}
labels:
kubevirt.io: "cdi-http-import-server"
spec:
selector:
matchLabels:
kubevirt.io: "cdi-http-import-server"
replicas: 1
template:
metadata:
labels:
kubevirt.io: cdi-http-import-server
spec:
serviceAccountName: kubevirt-testing
containers:
- name: cdi-http-import-server
image: {{.DockerPrefix}}/cdi-http-import-server:{{.DockerTag}}
imagePullPolicy: Always
ports:
- containerPort: 80
name: "http"
protocol: "TCP"
readinessProbe:
tcpSocket:
port: 80
initialDelaySeconds: 5
periodSeconds: 10
---
apiVersion: apps/v1
kind: DaemonSet
metadata:
Expand Down
2 changes: 1 addition & 1 deletion pkg/virt-controller/watch/snapshot/snapshot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ func createVirtualMachine(namespace, name string) *v1.VirtualMachine {
Spec: cdiv1.DataVolumeSpec{
Source: &cdiv1.DataVolumeSource{
HTTP: &cdiv1.DataVolumeSourceHTTP{
URL: "http://cdi-http-import-server.kubevirt/images/alpine.iso",
URL: "http://random-url/images/alpine.iso",
},
},
PVC: &corev1.PersistentVolumeClaimSpec{
Expand Down
Loading

0 comments on commit 1c1d511

Please sign in to comment.