Rename registrydisk docker to containerdisk

rsevilla87 · Nov 28, 2018 · 4970802 · 4970802
1 parent 45a2634
commit 4970802
Show file tree

Hide file tree

Showing 29 changed files with 36 additions and 36 deletions.
diff --git a/cluster/examples/vm-cirros.yaml b/cluster/examples/vm-cirros.yaml
@@ -32,7 +32,7 @@ spec:
       terminationGracePeriodSeconds: 0
       volumes:
       - containerDisk:
-          image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
+          image: registry:5000/kubevirt/cirros-container-disk-demo:devel
         name: registryvolume
       - cloudInitNoCloud:
           userData: |

diff --git a/cluster/examples/vm-template-fedora.yaml b/cluster/examples/vm-template-fedora.yaml
@@ -49,7 +49,7 @@ objects:
         terminationGracePeriodSeconds: 0
         volumes:
         - containerDisk:
-            image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+            image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
           name: registryvolume
         - cloudInitNoCloud:
             userData: |-

diff --git a/cluster/examples/vmi-ephemeral.yaml b/cluster/examples/vmi-ephemeral.yaml
@@ -21,6 +21,6 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-container-disk-demo:devel
     name: registryvolume
 status: {}
diff --git a/cluster/examples/vmi-fedora.yaml b/cluster/examples/vmi-fedora.yaml
@@ -25,7 +25,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |-

diff --git a/cluster/examples/vmi-flavor-small.yaml b/cluster/examples/vmi-flavor-small.yaml
@@ -21,6 +21,6 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-container-disk-demo:devel
     name: registryvolume
 status: {}
diff --git a/cluster/examples/vmi-genie-multiple-net.yaml b/cluster/examples/vmi-genie-multiple-net.yaml
@@ -37,7 +37,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |

diff --git a/cluster/examples/vmi-genie-ptp.yaml b/cluster/examples/vmi-genie-ptp.yaml
@@ -32,7 +32,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |

diff --git a/cluster/examples/vmi-migratable.yaml b/cluster/examples/vmi-migratable.yaml
@@ -21,6 +21,6 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/alpine-registry-disk-demo:devel
+      image: registry:5000/kubevirt/alpine-container-disk-demo:devel
     name: registryvolume
 status: {}
diff --git a/cluster/examples/vmi-multus-multiple-net.yaml b/cluster/examples/vmi-multus-multiple-net.yaml
@@ -36,7 +36,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |

diff --git a/cluster/examples/vmi-multus-ptp.yaml b/cluster/examples/vmi-multus-ptp.yaml
@@ -32,7 +32,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |

diff --git a/cluster/examples/vmi-nocloud.yaml b/cluster/examples/vmi-nocloud.yaml
@@ -29,7 +29,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |

diff --git a/cluster/examples/vmi-replicaset-cirros.yaml b/cluster/examples/vmi-replicaset-cirros.yaml
@@ -29,6 +29,6 @@ spec:
       terminationGracePeriodSeconds: 0
       volumes:
       - containerDisk:
-          image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
+          image: registry:5000/kubevirt/cirros-container-disk-demo:devel
         name: registryvolume
 status: {}
diff --git a/cluster/examples/vmi-sata.yaml b/cluster/examples/vmi-sata.yaml
@@ -21,6 +21,6 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/cirros-registry-disk-demo:devel
+      image: registry:5000/kubevirt/cirros-container-disk-demo:devel
     name: registryvolume
 status: {}
diff --git a/cluster/examples/vmi-slirp.yaml b/cluster/examples/vmi-slirp.yaml
@@ -35,7 +35,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |-

diff --git a/cluster/examples/vmi-sriov.yaml b/cluster/examples/vmi-sriov.yaml
@@ -39,7 +39,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |

diff --git a/cluster/examples/vmi-with-sidecar-hook.yaml b/cluster/examples/vmi-with-sidecar-hook.yaml
@@ -28,7 +28,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-registry-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
     name: registryvolume
   - cloudInitNoCloud:
       userData: |-

diff --git a/cmd/registry-disk-v1alpha/Dockerfile → cmd/container-disk-v1alpha/Dockerfile b/cmd/registry-disk-v1alpha/Dockerfile → cmd/container-disk-v1alpha/Dockerfile
diff --git a/cmd/registry-disk-v1alpha/README.md → cmd/container-disk-v1alpha/README.md b/cmd/registry-disk-v1alpha/README.md → cmd/container-disk-v1alpha/README.md
@@ -4,9 +4,9 @@ The KubeVirt Registry Disk Base Container allows users to store VMI disks in
 a container registry and attach those disk to VMIs automatically using the
 KubeVirt runtime.
 
-This Base Container is compatible with disk type RegistryDisk:v1alpha
+This Base Container is compatible with disk type ContainerDisk:v1alpha
 
-# RegistryDisk:v1alpha
+# ContainerDisk:v1alpha
 ## Storing Disks in Container Registry
 
 VMI disks can be stored in either qcow2 format or raw format by copying the vm
@@ -17,7 +17,7 @@ Example: Place a bootable VMI disk into a container image in the /disk directory
 and upload to the container registry.
 ```
 cat << END > Dockerfile 
-FROM kubevirt.io:registry-disk-v1alpha
+FROM kubevirt.io:container-disk-v1alpha
 ADD fedora25.qcow2 /disk
 END
 
@@ -28,7 +28,7 @@ docker push vmdisks/fedora25:latest
 ## Assigning Ephemeral Disks to VMIs
 
 Assign an ephemeral disk backed by an image in the container registry by
-adding a RegistryDisk:v1alpha disk to the VMI definition and supplying
+adding a ContainerDisk:v1alpha disk to the VMI definition and supplying
 the container image as the disk's source name.
 
 Example: Create a KubeVirt VMI definition with container backed ephemeral disk.
@@ -46,7 +46,7 @@ spec:
       disks:
       - disk:
           bus: virtio
-        name: registrydisk
+        name: containerdisk
         volumeName: registryvolume
     machine:
       type: ""
@@ -56,8 +56,8 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - name: registryvolume
-    registryDisk:
-      image: kubevirt/cirros-registry-disk-demo:devel
+    containerDisk:
+      image: kubevirt/cirros-container-disk-demo:devel
 status: {}
 END
 ```

diff --git a/cmd/registry-disk-v1alpha/entry-point.sh → cmd/container-disk-v1alpha/entry-point.sh b/cmd/registry-disk-v1alpha/entry-point.sh → cmd/container-disk-v1alpha/entry-point.sh
diff --git a/docs/cloud-init.md b/docs/cloud-init.md
@@ -44,7 +44,7 @@ spec:
       disks:
       - type: ContainerDisk:v1alpha
         source:
-          name: kubevirt/cirros-registry-disk-demo:devel
+          name: kubevirt/cirros-container-disk-demo:devel
         target:
           dev: vda
       - type: file
@@ -102,7 +102,7 @@ spec:
       disks:
       - type: ContainerDisk:v1alpha
         source:
-          name: kubevirt/cirros-registry-disk-demo:devel
+          name: kubevirt/cirros-container-disk-demo:devel
         target:
           dev: vda
       - type: file

diff --git a/docs/container-empty-disks.md b/docs/container-empty-disks.md
@@ -58,7 +58,7 @@ spec:
   volumes:
     - name: containerDisk
       containerDisk:
-        image: kubevirt/cirros-registry-disk-demo:devel
+        image: kubevirt/cirros-container-disk-demo:devel
     - name: emptyDisk
       emptyDisk:
         capacity: 20G

diff --git a/docs/container-register-disks.md b/docs/container-register-disks.md
@@ -62,7 +62,7 @@ device consumable by libvirt.
 Example:
 ```
 cat << END > Dockerfile
-FROM kubevirt/registry-disk-v1alpha
+FROM kubevirt/container-disk-v1alpha
 ADD fedora25.qcow2 /disk
 END
 docker build -t vmdisks/fedora25:latest .

diff --git a/hack/build-copy-artifacts.sh b/hack/build-copy-artifacts.sh
@@ -36,5 +36,5 @@ for arg in $args; do
     # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
     # Because of this we have to manipulate the Dockerfile for kubevirt containers
     # that depend on other kubevirt containers.
-    cat $arg/Dockerfile | sed -e "s#kubevirt/registry-disk-v1alpha#${docker_prefix}/registry-disk-v1alpha\:${docker_tag}#g" >${CMD_OUT_DIR}/${BIN_NAME}/Dockerfile
+    cat $arg/Dockerfile | sed -e "s#kubevirt/container-disk-v1alpha#${docker_prefix}/container-disk-v1alpha\:${docker_tag}#g" >${CMD_OUT_DIR}/${BIN_NAME}/Dockerfile
 done
diff --git a/hack/config-default.sh b/hack/config-default.sh
@@ -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 images/cdi-http-import-server"
+docker_images="cmd/virt-controller cmd/virt-launcher cmd/virt-handler cmd/virt-api images/disks-images-provider images/vm-killer cmd/container-disk-v1alpha images/cirros-container-disk-demo images/fedora-cloud-container-disk-demo images/alpine-container-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

diff --git a/images/alpine-registry-disk-demo/Dockerfile → images/alpine-container-disk-demo/Dockerfile b/images/alpine-registry-disk-demo/Dockerfile → images/alpine-container-disk-demo/Dockerfile
@@ -16,7 +16,7 @@
 # Copyright 2017 Red Hat, Inc.
 #
 
-FROM kubevirt/registry-disk-v1alpha
+FROM kubevirt/container-disk-v1alpha
 
 LABEL maintainer="The KubeVirt Project <[email protected]>"
 

diff --git a/images/cirros-registry-disk-demo/Dockerfile → images/cirros-container-disk-demo/Dockerfile b/images/cirros-registry-disk-demo/Dockerfile → images/cirros-container-disk-demo/Dockerfile
@@ -16,7 +16,7 @@
 # Copyright 2017 Red Hat, Inc.
 #
 
-FROM kubevirt/registry-disk-v1alpha
+FROM kubevirt/container-disk-v1alpha
 
 LABEL maintainer="David Vossel <[email protected]>"
 

diff --git a/...edora-cloud-registry-disk-demo/Dockerfile → ...dora-cloud-container-disk-demo/Dockerfile b/...edora-cloud-registry-disk-demo/Dockerfile → ...dora-cloud-container-disk-demo/Dockerfile
@@ -16,7 +16,7 @@
 # Copyright 2017 Red Hat, Inc.
 #
 
-FROM kubevirt/registry-disk-v1alpha
+FROM kubevirt/container-disk-v1alpha
 
 LABEL maintainer="The KubeVirt Project <[email protected]>"
 

diff --git a/tests/utils.go b/tests/utils.go
@@ -1685,7 +1685,7 @@ const (
 func ContainerDiskFor(name ContainerDisk) string {
 	switch name {
 	case ContainerDiskCirros, ContainerDiskAlpine, ContainerDiskFedora:
-		return fmt.Sprintf("%s/%s-registry-disk-demo:%s", KubeVirtRepoPrefix, name, KubeVirtVersionTag)
+		return fmt.Sprintf("%s/%s-container-disk-demo:%s", KubeVirtRepoPrefix, name, KubeVirtVersionTag)
 	}
 	panic(fmt.Sprintf("Unsupported registry disk %s", name))
 }

diff --git a/tools/vms-generator/utils/utils.go b/tools/vms-generator/utils/utils.go
@@ -76,9 +76,9 @@ const (
 )
 
 const (
-	imageAlpine = "alpine-registry-disk-demo"
-	imageCirros = "cirros-registry-disk-demo"
-	imageFedora = "fedora-cloud-registry-disk-demo"
+	imageAlpine = "alpine-container-disk-demo"
+	imageCirros = "cirros-container-disk-demo"
+	imageFedora = "fedora-cloud-container-disk-demo"
 )
 
 const windowsFirmware = "5d307ca9-b3ef-428c-8861-06e72d69f223"