wip

Signed-off-by: Daniil Loktev <[email protected]>

Author: loktev-d

images/virtualization-artifact/pkg/controller/service/uploader_service.go

@@ -267,6 +267,7 @@ func (s UploaderService) getPodSettings(ownerRef *metav1.OwnerReference, sup *su
 		ControllerName:       s.controllerName,
 		InstallerLabels:      map[string]string{},
 		ServiceName:          uploaderSvc.Name,
+		UID:                  string(sup.UID),
 		ResourceRequirements: &s.requirements,
 	}
 }
@@ -276,6 +277,7 @@ func (s UploaderService) getServiceSettings(ownerRef *metav1.OwnerReference, sup
 	return &uploader.ServiceSettings{
 		Name:           uploaderSvc.Name,
 		Namespace:      uploaderSvc.Namespace,
+		UID:            string(sup.UID),
 		OwnerReference: *ownerRef,
 	}
 }

images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go

@@ -60,6 +60,7 @@ type PodSettings struct {
 	ImagePullSecrets     []corev1.LocalObjectReference
 	PriorityClassName    string
 	ServiceName          string
+	UID                  string
 	NodePlacement        *provisioner.NodePlacement
 }
 
@@ -96,7 +97,7 @@ func (p *Pod) makeSpec() (*corev1.Pod, error) {
 			},
 			Labels: map[string]string{
 				annotations.AppLabel:             annotations.DVCRLabelValue,
-				annotations.UploaderServiceLabel: p.PodSettings.ServiceName,
+				annotations.UploaderServiceLabel: p.PodSettings.UID,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				p.PodSettings.OwnerReference,

images/virtualization-artifact/pkg/controller/uploader/uploader_service.go

@@ -31,6 +31,7 @@ import (
 type ServiceSettings struct {
 	Name           string
 	Namespace      string
+	UID            string
 	OwnerReference metav1.OwnerReference
 }
 
@@ -82,7 +83,7 @@ func (s *Service) makeSpec() *corev1.Service {
 				},
 			},
 			Selector: map[string]string{
-				annotations.UploaderServiceLabel: s.Settings.Name,
+				annotations.UploaderServiceLabel: s.Settings.UID,
 			},
 			Type: corev1.ServiceTypeClusterIP,
 		},