Skip to content

Commit

Permalink
add cdi import http server for func tests
Browse files Browse the repository at this point in the history
Signed-off-by: David Vossel <[email protected]>
  • Loading branch information
davidvossel committed Aug 31, 2018
1 parent 3a398b1 commit 9f1a1f1
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 2 deletions.
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-controller cmd/virt-launcher cmd/virt-handler cmd/virtctl cmd/fake-qemu-process cmd/virt-api cmd/subresource-access-test cmd/example-hook-sidecar"
docker_images="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api images/disks-images-provider images/vm-killer cmd/registry-disk-v1alpha images/cirros-registry-disk-demo images/fedora-cloud-registry-disk-demo images/alpine-registry-disk-demo cmd/subresource-access-test images/winrmcli cmd/example-hook-sidecar"
docker_images="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api images/disks-images-provider images/vm-killer cmd/registry-disk-v1alpha images/cirros-registry-disk-demo images/fedora-cloud-registry-disk-demo images/alpine-registry-disk-demo cmd/subresource-access-test images/winrmcli cmd/example-hook-sidecar images/cdi-http-import-server"
docker_prefix=${DOCKER_PREFIX:-kubevirt}
docker_tag=${DOCKER_TAG:-latest}
master_ip=192.168.200.2
Expand Down
34 changes: 34 additions & 0 deletions images/cdi-http-import-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#
# This file is part of the KubeVirt project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Copyright 2017 Red Hat, Inc.
#

FROM fedora:27

MAINTAINER "The KubeVirt Project" <[email protected]>
ENV container docker

RUN dnf install -y nginx \
&& dnf -y clean all

RUN mkdir -p /usr/share/nginx/html/images \
&& curl http://dl-cdn.alpinelinux.org/alpine/v3.7/releases/x86_64/alpine-virt-3.7.0-x86_64.iso > /usr/share/nginx/html/images/alpine.iso \
&& rm -f /etc/nginx/nginx.conf

ADD nginx.conf /etc/nginx/

EXPOSE 80

13 changes: 13 additions & 0 deletions images/cdi-http-import-server/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
worker_processes 1;
daemon off;
events { worker_connections 1024; }

http {
include mime.types;
sendfile on;
server {
root /usr/share/nginx/html/;
server_name localhost;
listen 80;
}
}
2 changes: 1 addition & 1 deletion images/disks-images-provider/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MAINTAINER "The KubeVirt Project" <[email protected]>
ENV container docker

# Prepare all images
RUN mkdir -p /images/custom /images/alpine \
RUN mkdir -p /images/custom /images/alpine /images/datavolume1 /images/datavolume2 /images/datavolume3 \
&& truncate -s 64M /images/custom/disk.img \
&& curl http://dl-cdn.alpinelinux.org/alpine/v3.7/releases/x86_64/alpine-virt-3.7.0-x86_64.iso > /images/alpine/disk.img

Expand Down
45 changes: 45 additions & 0 deletions manifests/testing/disks-images-provider.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,51 @@ spec:
hostPath:
path: /tmp/hostImages/custom
---
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: extensions/v1beta1
kind: Deployment
metadata:
name: cdi-http-import-server
namespace: {{.Namespace}}
labels:
kubevirt.io: "cdi-http-import-server"
spec:
replicas: 1
template:
metadata:
labels:
kubevirt.io: cdi-http-import-server
spec:
containers:
- name: cdi-http-import-server
image: {{.DockerPrefix}}/cdi-http-import-server:{{.DockerTag}}
imagePullPolicy: IfNotPresent
command:
- "/usr/sbin/nginx"
ports:
- containerPort: 80
name: "http"
protocol: "TCP"
readinessProbe:
tcpSocket:
port: 80
initialDelaySeconds: 5
periodSeconds: 10
---
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
Expand Down

0 comments on commit 9f1a1f1

Please sign in to comment.