From ca62b6c0760094137b159095b854efd30358489a Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Mon, 12 Aug 2024 10:14:48 +0100
Subject: [PATCH] dataImportCronTemplates: Remove CentOS 7 & stream 8

Both releases are now EOL with their associated containerdisks also
deprecated ahead of removal in the near future:

https://github.com/kubevirt/containerdisks/issues/154
https://github.com/kubevirt/containerdisks/issues/152

Conflicts:
  assets/dataImportCronTemplates/dataImportCronTemplates.yaml
  tests/func-tests/golden_image_test.go

NOTE: The conflict is due to commits c70bb07 and 4e8265f missing in
release-1.12.

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
Co-authored-by: Felix Matouschek <fmatouschek.com>
---
 .../dataImportCronTemplates.yaml              | 40 -------------------
 tests/func-tests/golden_image_test.go         |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/assets/dataImportCronTemplates/dataImportCronTemplates.yaml b/assets/dataImportCronTemplates/dataImportCronTemplates.yaml
index 1c8d37ac30..476afc76f0 100644
--- a/assets/dataImportCronTemplates/dataImportCronTemplates.yaml
+++ b/assets/dataImportCronTemplates/dataImportCronTemplates.yaml
@@ -1,23 +1,3 @@
-- metadata:
-    annotations:
-      cdi.kubevirt.io/storage.bind.immediate.requested: "true"
-    name: centos-stream8-image-cron
-    labels:
-      instancetype.kubevirt.io/default-preference: centos.stream8
-      instancetype.kubevirt.io/default-instancetype: u1.medium
-  spec:
-    schedule: "0 */12 * * *"
-    template:
-      spec:
-        source:
-          registry:
-            url: docker://quay.io/containerdisks/centos-stream:8
-        storage:
-          resources:
-            requests:
-              storage: 10Gi
-    garbageCollect: Outdated
-    managedDataSource: centos-stream8
 - metadata:
     annotations:
       cdi.kubevirt.io/storage.bind.immediate.requested: "true"
@@ -58,23 +38,3 @@
               storage: 5Gi
     garbageCollect: Outdated
     managedDataSource: fedora
-- metadata:
-    annotations:
-      cdi.kubevirt.io/storage.bind.immediate.requested: "true"
-    name: centos-7-image-cron
-    labels:
-      instancetype.kubevirt.io/default-preference: centos.7
-      instancetype.kubevirt.io/default-instancetype: u1.medium
-  spec:
-    schedule: "0 */12 * * *"
-    template:
-      spec:
-        source:
-          registry:
-            url: docker://quay.io/containerdisks/centos:7-2009
-        storage:
-          resources:
-            requests:
-              storage: 10Gi
-    garbageCollect: Outdated
-    managedDataSource: centos7
diff --git a/tests/func-tests/golden_image_test.go b/tests/func-tests/golden_image_test.go
index 4911a2ed14..93cef609dd 100644
--- a/tests/func-tests/golden_image_test.go
+++ b/tests/func-tests/golden_image_test.go
@@ -54,7 +54,7 @@ var (
 		Resource: "ssps",
 	}
 
-	expectedImages       = []string{"centos-7-image-cron", "centos-stream8-image-cron", "centos-stream9-image-cron", "centos8-image-cron-is", "fedora-image-cron"}
+	expectedImages       = []string{"centos-stream9-image-cron", "centos8-image-cron-is", "fedora-image-cron"}
 	imageNamespace       = defaultImageNamespace
 	expectedImageStreams = []tests.ImageStreamConfig{
 		{