diff --git a/build/components/versions.yml b/build/components/versions.yml index cf2bde402c..f6eaae2f29 100644 --- a/build/components/versions.yml +++ b/build/components/versions.yml @@ -3,8 +3,8 @@ firmware: libvirt: v10.9.0 edk2: stable202411 core: - 3p-kubevirt: v1.6.2-v12n.5 - 3p-containerized-data-importer: v1.60.3-v12n.14 + 3p-kubevirt: v1.6.2-v12n.6 + 3p-containerized-data-importer: v1.60.3-v12n.15 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 420f530e5c..1d00d098ef 100644 --- a/images/virtualization-artifact/pkg/common/annotations/annotations.go +++ b/images/virtualization-artifact/pkg/common/annotations/annotations.go @@ -180,6 +180,11 @@ const ( // QuotaDiscountMemory provides a constant for discount Memory from quota annotation. QuotaDiscountMemory = "resource-quota-overrides.deckhouse.io/discount-memory" + // HeritageLabel is the label to indicate Pod heritage. + HeritageLabel = "heritage" + // HeritageValue is the value to indicate Pod is related to the deckhouse. + HeritageValue = "deckhouse" + // 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/bounder/bounder.go b/images/virtualization-artifact/pkg/controller/bounder/bounder.go index 4dffbcf623..8a7316cd16 100644 --- a/images/virtualization-artifact/pkg/controller/bounder/bounder.go +++ b/images/virtualization-artifact/pkg/controller/bounder/bounder.go @@ -86,6 +86,9 @@ func (imp *Bounder) makeBounderPodSpec() (*corev1.Pod, error) { Annotations: map[string]string{ annotations.AnnCreatedBy: "yes", }, + Labels: map[string]string{ + annotations.HeritageLabel: annotations.HeritageValue, + }, Finalizers: []string{ imp.PodSettings.Finalizer, }, diff --git a/images/virtualization-artifact/pkg/controller/importer/importer_pod.go b/images/virtualization-artifact/pkg/controller/importer/importer_pod.go index 2ba1faec67..12ec6f4428 100644 --- a/images/virtualization-artifact/pkg/controller/importer/importer_pod.go +++ b/images/virtualization-artifact/pkg/controller/importer/importer_pod.go @@ -122,6 +122,7 @@ func (imp *Importer) makeImporterPodSpec() (*corev1.Pod, error) { Name: imp.PodSettings.Name, Namespace: imp.PodSettings.Namespace, Labels: map[string]string{ + annotations.HeritageLabel: annotations.HeritageValue, annotations.AppLabel: annotations.DVCRLabelValue, annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue, }, diff --git a/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go b/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go index a6a9a96d7b..5c50ad2b21 100644 --- a/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go +++ b/images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go @@ -95,6 +95,7 @@ func (p *Pod) makeSpec() (*corev1.Pod, error) { annotations.AnnCreatedBy: "yes", }, Labels: map[string]string{ + annotations.HeritageLabel: annotations.HeritageValue, annotations.AppLabel: annotations.DVCRLabelValue, annotations.UploaderServiceLabel: p.PodSettings.ServiceName, annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue,