diff --git a/build/components/versions.yml b/build/components/versions.yml index c31113144f..3fc8825049 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -4,7 +4,7 @@ firmware: edk2: stable202411 core: 3p-kubevirt: v1.6.2-v12n.4 - 3p-containerized-data-importer: v1.60.3-v12n.13 + 3p-containerized-data-importer: v1.60.3-v12n.14 distribution: 2.8.3 package: acl: v2.3.1 diff --git a/images/virtualization-artifact/pkg/common/annotations/annotations.go b/images/virtualization-artifact/pkg/common/annotations/annotations.go index 806487904c..64af0ead86 100644 --- a/images/virtualization-artifact/pkg/common/annotations/annotations.go +++ b/images/virtualization-artifact/pkg/common/annotations/annotations.go @@ -171,6 +171,11 @@ const ( // DVCRLabelValue provides a constant for DVCR Pod label values. DVCRLabelValue = "dvcr-data-importer" + // QuotaExcludeValue provides a constant for exclude quota value. + QuotaExcludeValue = "true" + // QuotaExcludeLabel provides a constant for exclude quota label. + QuotaExcludeLabel = "resource-quota-overrides.deckhouse.io/ignore" + // InhibitNodeShutdownLabel is a label to prevent node shutdown is Pod with label is present. InhibitNodeShutdownLabel = "pod.deckhouse.io/inhibit-node-shutdown" diff --git a/images/virtualization-artifact/pkg/controller/importer/importer_pod.go b/images/virtualization-artifact/pkg/controller/importer/importer_pod.go index 15949abb71..2ba1faec67 100644 --- a/images/virtualization-artifact/pkg/controller/importer/importer_pod.go +++ b/images/virtualization-artifact/pkg/controller/importer/importer_pod.go @@ -122,7 +122,8 @@ func (imp *Importer) makeImporterPodSpec() (*corev1.Pod, error) { Name: imp.PodSettings.Name, Namespace: imp.PodSettings.Namespace, Labels: map[string]string{ - annotations.AppLabel: annotations.DVCRLabelValue, + annotations.AppLabel: annotations.DVCRLabelValue, + annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue, }, Annotations: map[string]string{ annotations.AnnCreatedBy: "yes", diff --git a/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go b/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go index 4db1e97049..a6a9a96d7b 100644 --- a/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go +++ b/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go @@ -97,6 +97,7 @@ func (p *Pod) makeSpec() (*corev1.Pod, error) { Labels: map[string]string{ annotations.AppLabel: annotations.DVCRLabelValue, annotations.UploaderServiceLabel: p.PodSettings.ServiceName, + annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue, }, OwnerReferences: []metav1.OwnerReference{ p.PodSettings.OwnerReference,