Addressed review comments.

Signed-off-by: Alexander Wels <[email protected]>
zfy3000163 · Jun 1, 2022 · 4bcc8d8 · 4bcc8d8
1 parent 06659b0
commit 4bcc8d8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/pkg/controller/virtinformers.go b/pkg/controller/virtinformers.go
@@ -152,7 +152,7 @@ type KubeInformerFactory interface {
 	// Watches for the kubevirt export CA config map
 	KubeVirtExportCAConfigMap() cache.SharedIndexInformer
 
-	// Watches for the kubevirt export CA config map
+	// Watches for the kubevirt export service
 	ExportService() cache.SharedIndexInformer
 
 	// ConfigMaps which are managed by the operator

diff --git a/pkg/virt-controller/watch/application.go b/pkg/virt-controller/watch/application.go
@@ -671,7 +671,6 @@ func (vca *VirtControllerApp) initExportController() {
 		VMExportInformer:   vca.vmExportInformer,
 		PVCInformer:        vca.persistentVolumeClaimInformer,
 		PodInformer:        vca.allPodInformer,
-		VMInformer:         vca.vmInformer,
 		DataVolumeInformer: vca.dataVolumeInformer,
 		ServiceInformer:    vca.exportServiceInformer,
 		Recorder:           recorder,

diff --git a/pkg/virt-controller/watch/application_test.go b/pkg/virt-controller/watch/application_test.go
@@ -184,7 +184,6 @@ var _ = Describe("Application", func() {
 			VMExportInformer:   vmExportInformer,
 			PVCInformer:        pvcInformer,
 			PodInformer:        podInformer,
-			VMInformer:         vmInformer,
 			DataVolumeInformer: dataVolumeInformer,
 			ServiceInformer:    exportServiceInformer,
 			ConfigMapInformer:  configMapInformer,

diff --git a/pkg/virt-controller/watch/export/export.go b/pkg/virt-controller/watch/export/export.go
@@ -146,7 +146,6 @@ type VMExportController struct {
 	VMExportInformer   cache.SharedIndexInformer
 	PVCInformer        cache.SharedIndexInformer
 	PodInformer        cache.SharedIndexInformer
-	VMInformer         cache.SharedIndexInformer
 	DataVolumeInformer cache.SharedIndexInformer
 	ConfigMapInformer  cache.SharedIndexInformer
 	ServiceInformer    cache.SharedIndexInformer
@@ -205,6 +204,10 @@ func (ctrl *VMExportController) Run(threadiness int, stopCh <-chan struct{}) err
 		stopCh,
 		ctrl.VMExportInformer.HasSynced,
 		ctrl.PVCInformer.HasSynced,
+		ctrl.PodInformer.HasSynced,
+		ctrl.DataVolumeInformer.HasSynced,
+		ctrl.ConfigMapInformer.HasSynced,
+		ctrl.ServiceInformer.HasSynced,
 	) {
 		return fmt.Errorf("failed to wait for caches to sync")
 	}

diff --git a/pkg/virt-operator/resource/generate/components/deployments.go b/pkg/virt-operator/resource/generate/components/deployments.go
@@ -364,7 +364,7 @@ func NewControllerDeployment(namespace string, repository string, imagePrefix st
 		"--launcher-image",
 		fmt.Sprintf("%s/%s%s%s", repository, imagePrefix, "virt-launcher", launcherVersion),
 		"--exporter-image",
-		"ghcr.io/mhenriks/virt-exportserver:latest",
+		"ghcr.io/mhenriks/virt-exportserver@sha256:a26c053a80dbf4cfc35e7ed15d0d45c0c06a54d8ad9a49a2832b317c6ef30067",
 		portName,
 		"8443",
 		"-v",