[release-1.12] dataImportCronTemplates: Remove CentOS 7 & stream 8 (#…

…3066) * dataImportCronTemplates: Remove CentOS 7 & stream 8 Both releases are now EOL with their associated containerdisks also deprecated ahead of removal in the near future: kubevirt/containerdisks#154 kubevirt/containerdisks#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 <[email protected]> Co-authored-by: Felix Matouschek <fmatouschek.com> * tests: Remove use of CentOS 8 from golden image func tests The source of this image stream is also changed to the smaller and more up to date containerdisks project version of the image. Conflicts: tests/func-tests/golden_image_test.go NOTE: The conflict is due to commit 4e8265f missing in release-1.12. Signed-off-by: Lee Yarwood <[email protected]> Co-authored-by: Felix Matouschek <[email protected]> --------- Signed-off-by: Lee Yarwood <[email protected]> Co-authored-by: Lee Yarwood <[email protected]>
kubevirt · Aug 26, 2024 · 8dbde2c · 8dbde2c
1 parent cd9499b
commit 8dbde2c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 50 deletions.
diff --git 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/build/Dockerfile.okd b/build/Dockerfile.okd
@@ -7,6 +7,6 @@ COPY hack/testFiles/test_quickstart.yaml quickStart/
 COPY hack/testFiles/test_dashboard_cm.yaml dashboard/
 COPY assets/ .
 COPY ci-test-files/dataImportCronTemplatesWithImageStream.yaml dataImportCronTemplates/
-COPY ci-test-files/centos8-imagestream.yaml imageStreams/
+COPY ci-test-files/centos9-stream-imagestream.yaml imageStreams/
 
 ENTRYPOINT /usr/bin/hyperconverged-cluster-operator
diff --git a/ci-test-files/centos8-imagestream.yaml → ...est-files/centos9-stream-imagestream.yaml b/ci-test-files/centos8-imagestream.yaml → ...est-files/centos9-stream-imagestream.yaml
@@ -1,7 +1,7 @@
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  name: centos8
+  name: centos-stream9
   namespace: kubevirt-os-images
 spec:
   lookupPolicy:
@@ -10,7 +10,7 @@ spec:
   - annotations: null
     from:
       kind: DockerImage
-      name: quay.io/kubevirt/centos8-container-disk-images
+      name: quay.io/containerdisks/centos-stream:9
     importPolicy:
       scheduled: true
       importMode: Legacy

diff --git a/ci-test-files/dataImportCronTemplatesWithImageStream.yaml b/ci-test-files/dataImportCronTemplatesWithImageStream.yaml
@@ -1,16 +1,16 @@
 - metadata:
-    name: centos8-image-cron-is
+    name: centos-stream9-image-cron-is
   spec:
     schedule: "0 */12 * * *"
     template:
       spec:
         source:
           registry:
-            imageStream: "centos8"
+            imageStream: "centos-stream9"
             pullMethod: node
         storage:
           resources:
             requests:
               storage: 10Gi
     garbageCollect: Outdated
-    managedDataSource: centos8-is
+    managedDataSource: centos-stream9-is
diff --git a/tests/func-tests/golden_image_test.go b/tests/func-tests/golden_image_test.go
@@ -54,13 +54,13 @@ 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", "centos-stream9-image-cron-is", "fedora-image-cron"}
 	imageNamespace       = defaultImageNamespace
 	expectedImageStreams = []tests.ImageStreamConfig{
 		{
-			Name:         "centos8",
-			RegistryName: "quay.io/kubevirt/centos8-container-disk-images",
-			UsageImages:  []string{"centos8-image-cron-is"},
+			Name:         "centos-stream9",
+			RegistryName: "quay.io/containerdisks/centos-stream:9",
+			UsageImages:  []string{"centos-stream9-image-cron-is"},
 		},
 	}
 )