Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dataImportCronTemplates: Remove CentOS 7 & stream 8 #3048

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions assets/dataImportCronTemplates/dataImportCronTemplates.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
- metadata:
annotations:
cdi.kubevirt.io/storage.bind.immediate.requested: "true"
name: centos-stream8-image-cron
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"
Expand Down Expand Up @@ -49,20 +32,3 @@
storage: 5Gi
garbageCollect: Outdated
managedDataSource: fedora
- metadata:
annotations:
cdi.kubevirt.io/storage.bind.immediate.requested: "true"
name: centos-7-image-cron
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
2 changes: 1 addition & 1 deletion build/Dockerfile.okd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: centos8
name: centos-stream9
namespace: kubevirt-os-images
spec:
lookupPolicy:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci-test-files/dataImportCronTemplatesWithImageStream.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions tests/func-tests/golden_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ const (
)

var (
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"},
},
}
)
Expand Down
Loading