Remove all references to the plain fedora cloud image

Signed-off-by: Roman Mohr <rmohr@redhat.com>
yulng · Aug 10, 2021 · 205d324 · 205d324
1 parent ce2d220
commit 205d324
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 54 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -191,7 +191,6 @@ container_bundle(
         "$(container_prefix)/$(image_prefix)alpine-container-disk-demo:$(container_tag)": "//containerimages:alpine-container-disk-image",
         "$(container_prefix)/$(image_prefix)cirros-container-disk-demo:$(container_tag)": "//containerimages:cirros-container-disk-image",
         "$(container_prefix)/$(image_prefix)cirros-custom-container-disk-demo:$(container_tag)": "//containerimages:cirros-custom-container-disk-image",
-        "$(container_prefix)/$(image_prefix)fedora-cloud-container-disk-demo:$(container_tag)": "//containerimages:fedora-cloud-container-disk-image",
         "$(container_prefix)/$(image_prefix)microlivecd-container-disk-demo:$(container_tag)": "//containerimages:microlivecd-container-disk-image",
         "$(container_prefix)/$(image_prefix)virtio-container-disk:$(container_tag)": "//containerimages:virtio-container-disk-image",
         # Kernel boot container

diff --git a/WORKSPACE b/WORKSPACE
@@ -121,21 +121,6 @@ http_file(
     ],
 )
 
-http_file(
-    name = "fedora_image",
-    sha256 = "423a4ce32fa32c50c11e3d3ff392db97a762533b81bef9d00599de518a7469c8",
-    urls = ["https://storage.googleapis.com/builddeps/423a4ce32fa32c50c11e3d3ff392db97a762533b81bef9d00599de518a7469c8"],
-)
-
-http_file(
-    name = "fedora_image_aarch64",
-    sha256 = "b367755c664a2d7a26955bbfff985855adfa2ca15e908baf15b4b176d68d3967",
-    urls = [
-        "https://dl.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/aarch64/images/Fedora-Cloud-Base-32-1.6.aarch64.qcow2",
-        "https://storage.googleapis.com/builddeps/b367755c664a2d7a26955bbfff985855adfa2ca15e908baf15b4b176d68d3967",
-    ],
-)
-
 http_file(
     name = "microlivecd_image",
     sha256 = "ae449ae8c0f73b1a7e2c394bc5385e7ab01d8fc000f5b074bc8b2aaabf931eac",

diff --git a/containerimages/BUILD.bazel b/containerimages/BUILD.bazel
@@ -65,27 +65,6 @@ container_image(
     visibility = ["//visibility:public"],
 )
 
-pkg_tar(
-    name = "fedora-cloud-image-tar",
-    srcs = select({
-        "@io_bazel_rules_go//go/platform:linux_arm64": ["@fedora_image_aarch64//file"],
-        "//conditions:default": ["@fedora_image//file"],
-    }),
-    mode = "440",
-    owner = "107.107",
-    package_dir = "/disk",
-)
-
-container_image(
-    name = "fedora-cloud-container-disk-image",
-    architecture = select({
-        "@io_bazel_rules_go//go/platform:linux_arm64": "arm64",
-        "//conditions:default": "amd64",
-    }),
-    tars = [":fedora-cloud-image-tar"],
-    visibility = ["//visibility:public"],
-)
-
 pkg_tar(
     name = "microlivecd-image-tar",
     srcs = select({

diff --git a/examples/vm-template-fedora.yaml b/examples/vm-template-fedora.yaml
@@ -60,7 +60,7 @@ objects:
               chpasswd: { expire: False }
           name: cloudinitdisk
         - containerDisk:
-            image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+            image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
           name: containerdisk
   status: {}
 parameters:

diff --git a/examples/vmi-fedora.yaml b/examples/vmi-fedora.yaml
@@ -22,7 +22,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
     name: containerdisk
   - cloudInitNoCloud:
       userData: |-

diff --git a/examples/vmi-gpu.yaml b/examples/vmi-gpu.yaml
@@ -25,7 +25,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
     name: containerdisk
   - cloudInitNoCloud:
       userData: |-

diff --git a/examples/vmi-macvtap.yaml b/examples/vmi-macvtap.yaml
@@ -29,7 +29,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
     name: containerdisk
   - cloudInitNoCloud:
       userData: |-

diff --git a/examples/vmi-masquerade.yaml b/examples/vmi-masquerade.yaml
@@ -32,7 +32,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
     name: containerdisk
   - cloudInitNoCloud:
       networkData: |

diff --git a/examples/vmi-multus-multiple-net.yaml b/examples/vmi-multus-multiple-net.yaml
@@ -33,7 +33,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
     name: containerdisk
   - cloudInitNoCloud:
       userData: |

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

diff --git a/examples/vmi-slirp.yaml b/examples/vmi-slirp.yaml
@@ -32,7 +32,7 @@ spec:
   terminationGracePeriodSeconds: 0
   volumes:
   - containerDisk:
-      image: registry:5000/kubevirt/fedora-cloud-container-disk-demo:devel
+      image: registry:5000/kubevirt/fedora-with-test-tooling-container-disk:devel
     name: containerdisk
   - cloudInitNoCloud:
       userData: |-

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

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

diff --git a/images/cdi-http-import-server/BUILD.bazel b/images/cdi-http-import-server/BUILD.bazel
@@ -49,13 +49,13 @@ pkg_tar(
 genrule(
     name = "fedora-img",
     srcs = select({
-        "@io_bazel_rules_go//go/platform:linux_arm64": ["@fedora_image_aarch64//file"],
-        "//conditions:default": ["@fedora_image//file"],
+        "@io_bazel_rules_go//go/platform:linux_arm64": ["@fedora_with_test_tooling_aarch64//file"],
+        "//conditions:default": ["@fedora_with_test_tooling//file"],
     }),
     outs = ["usr/share/nginx/html/images/fedora.img"],
     cmd = select({
-        "@io_bazel_rules_go//go/platform:linux_arm64": "mkdir disk && cat $(location @fedora_image_aarch64//file) > $@",
-        "//conditions:default": "mkdir disk && cat $(location @fedora_image//file) > $@",
+        "@io_bazel_rules_go//go/platform:linux_arm64": "mkdir disk && cat $(location @fedora_with_test_tooling_aarch64//file) > $@",
+        "//conditions:default": "mkdir disk && cat $(location @fedora_with_test_tooling//file) > $@",
     }),
 )
 

diff --git a/images/disks-images-provider/BUILD.bazel b/images/disks-images-provider/BUILD.bazel
@@ -33,8 +33,8 @@ genrule(
 genrule(
     name = "fedora-img",
     srcs = select({
-        "@io_bazel_rules_go//go/platform:linux_arm64": ["@fedora_image_aarch64//file"],
-        "//conditions:default": ["@fedora_image//file"],
+        "@io_bazel_rules_go//go/platform:linux_arm64": ["@fedora_with_test_tooling_aarch64//file"],
+        "//conditions:default": ["@fedora_with_test_tooling//file"],
     }),
     outs = ["images/fedora-cloud/disk.qcow2"],
     cmd = select({

diff --git a/tools/vms-generator/utils/utils.go b/tools/vms-generator/utils/utils.go
@@ -89,7 +89,7 @@ const (
 const (
 	imageAlpine      = "alpine-container-disk-demo"
 	imageCirros      = "cirros-container-disk-demo"
-	imageFedora      = "fedora-cloud-container-disk-demo"
+	imageFedora      = "fedora-with-test-tooling-container-disk"
 	imageMicroLiveCD = "microlivecd-container-disk-demo"
 	imageKernelBoot  = "alpine-ext-kernel-boot-demo"
 )