diff --git a/assets/dataImportCronTemplates/dataImportCronTemplates.yaml b/assets/dataImportCronTemplates/dataImportCronTemplates.yaml index 8e81ab2da7..2ed8e80afd 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.8.stream - instancetype.kubevirt.io/default-instancetype: server.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: server.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/hack/check_golden_images.sh b/hack/check_golden_images.sh index 3e35aacce0..de45018c82 100755 --- a/hack/check_golden_images.sh +++ b/hack/check_golden_images.sh @@ -23,9 +23,7 @@ if [[ $(${KUBECTL_BINARY} get ssp -n ${INSTALLED_NAMESPACE}) ]]; then ./hack/retry.sh 10 3 "[[ -z '$(${KUBECTL_BINARY} get imageStream -n ${IMAGES_NS} centos8 -o jsonpath='{.metadata.labels.test-label}')' ]]" "${KUBECTL_BINARY} get imageStream -n ${IMAGES_NS} centos8 -o yaml" ${KUBECTL_BINARY} get hco -n "${INSTALLED_NAMESPACE}" kubevirt-hyperconverged -o jsonpath='{.spec.featureGates.enableCommonBootImageImport}' - ${KUBECTL_BINARY} get ssp -n "${INSTALLED_NAMESPACE}" ssp-kubevirt-hyperconverged -o jsonpath='{.spec.commonTemplates.dataImportCronTemplates}' | jq -e '.[] |select(.metadata.name=="centos-stream8-image-cron")' ${KUBECTL_BINARY} get ssp -n "${INSTALLED_NAMESPACE}" ssp-kubevirt-hyperconverged -o jsonpath='{.spec.commonTemplates.dataImportCronTemplates}' | jq -e '.[] |select(.metadata.name=="centos-stream9-image-cron")' - ${KUBECTL_BINARY} get ssp -n "${INSTALLED_NAMESPACE}" ssp-kubevirt-hyperconverged -o jsonpath='{.spec.commonTemplates.dataImportCronTemplates}' | jq -e '.[] |select(.metadata.name=="centos-7-image-cron")' ${KUBECTL_BINARY} get ssp -n "${INSTALLED_NAMESPACE}" ssp-kubevirt-hyperconverged -o jsonpath='{.spec.commonTemplates.dataImportCronTemplates}' | jq -e '.[] |select(.metadata.name=="fedora-image-cron")' ${KUBECTL_BINARY} get ssp -n "${INSTALLED_NAMESPACE}" ssp-kubevirt-hyperconverged -o jsonpath='{.spec.commonTemplates.dataImportCronTemplates}' | jq -e '.[] |select(.metadata.name=="centos8-image-cron-is")' @@ -33,9 +31,7 @@ if [[ $(${KUBECTL_BINARY} get ssp -n ${INSTALLED_NAMESPACE}) ]]; then ${KUBECTL_BINARY} get DataImportCron -n ${IMAGES_NS} - ${KUBECTL_BINARY} get DataImportCron -o yaml -n ${IMAGES_NS} centos-stream8-image-cron ${KUBECTL_BINARY} get DataImportCron -o yaml -n ${IMAGES_NS} centos-stream9-image-cron - ${KUBECTL_BINARY} get DataImportCron -o yaml -n ${IMAGES_NS} centos-7-image-cron ${KUBECTL_BINARY} get DataImportCron -o yaml -n ${IMAGES_NS} fedora-image-cron ${KUBECTL_BINARY} get DataImportCron -o yaml -n ${IMAGES_NS} centos8-image-cron-is || true