Check ImageRegistryConfig management state isn't set to Removed (#239)

Signed-off-by: Tiger Kaovilai <[email protected]>

Author: kaovilai

velero-plugins/pod/restore.go

@@ -304,15 +304,6 @@ func (p *RestorePlugin) Execute(input *velero.RestoreItemActionExecuteInput) (*v
 	return velero.NewRestoreItemActionExecuteOutput(&unstructured.Unstructured{Object: out}), nil
 }
 
-// checks the OCP Image registry existence
-func (p *RestorePlugin) DoRegistryReplicasExist() (bool, error) {
-	ocpRegistryHasReplicas, err := openshift.ImageRegistryHasReplicas()
-	if err != nil {
-		return false, err
-	}
-	return ocpRegistryHasReplicas, nil
-}
-
 // Fetches OCP version information
 func (p *RestorePlugin) GetOCPVersion() (int, int, error) {
 	ocpVersion, err := openshift.GetClusterVersion()
@@ -338,7 +329,7 @@ func (p *RestorePlugin) UpdateWaitForPullSecrets() (bool, error) {
 		return false, err
 	}
 
-	registryReplicasExist, err := p.DoRegistryReplicasExist()
+	imageRegistryConfigIsNotRemoved, err := openshift.ImageRegistryConfigIsNotRemoved()
 	if err != nil {
 		return false, err
 	}
@@ -348,7 +339,7 @@ func (p *RestorePlugin) UpdateWaitForPullSecrets() (bool, error) {
 		return false, err
 	}
 
-	if !(imageRegistryEnabled && registryReplicasExist) && (majorVersionInt == 4 && minorVersionInt >= 15 || majorVersionInt > 4) {
+	if !(imageRegistryEnabled && imageRegistryConfigIsNotRemoved) && (majorVersionInt == 4 && minorVersionInt >= 15 || majorVersionInt > 4) {
 		return false, nil
 	}
 

velero-plugins/util/openshift/imageregistry.go

@@ -2,9 +2,11 @@ package openshift
 
 import (
 	"context"
+
 	"github.com/konveyor/openshift-velero-plugin/velero-plugins/clients"
 	configv1 "github.com/openshift/api/config/v1"
 	v1 "github.com/openshift/api/imageregistry/v1"
+	operatorv1 "github.com/openshift/api/operator/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -36,15 +38,15 @@ func ImageRegistryCapabilityEnabled() (bool, error) {
 	return false, nil
 }
 
-func ImageRegistryHasReplicas() (bool, error) {
+func ImageRegistryConfigIsNotRemoved() (bool, error) {
 	c, err := GetImageRegistryConfig()
 	if err != nil {
 		if k8serrors.IsNotFound(err) {
 			return false, nil
 		}
 		return false, err
 	}
-	return c.Status.ReadyReplicas > 0, nil
+	return c.Spec.ManagementState != operatorv1.Removed, nil
 }
 
 // https://github.com/openshift/cluster-image-registry-operator/blob/48875d3ccb4595be9d3bec563d1fda2eb940cecf/pkg/defaults/defaults.go#L19