use var from apicfgv1

Signed-off-by: Qi Wang <qiwan@redhat.com>

Author: QiWang19

pkg/controller/container-runtime-config/container_runtime_config_controller.go

@@ -12,7 +12,6 @@ import (
 	signature "github.com/containers/image/v5/signature"
 	ign3types "github.com/coreos/ignition/v2/config/v3_5/types"
 	apicfgv1 "github.com/openshift/api/config/v1"
-	apicfgv1alpha1 "github.com/openshift/api/config/v1alpha1"
 	features "github.com/openshift/api/features"
 	apioperatorsv1alpha1 "github.com/openshift/api/operator/v1alpha1"
 	configclientset "github.com/openshift/client-go/config/clientset/versioned"
@@ -1109,7 +1108,7 @@ func getValidScopePolicies(clusterImagePolicies []*apicfgv1.ClusterImagePolicy,
 			if len(conflictScopes) > 0 {
 				msg := fmt.Sprintf("has conflicting scope(s) %q that equal to or nest inside existing clusterimagepolicy, only policy from clusterimagepolicy scope(s) will be applied", conflictScopes)
 				klog.V(2).Info(msg)
-				ctrl.syncImagePolicyStatusOnly(namespace, imagePolicy.ObjectMeta.Name, apicfgv1alpha1.ImagePolicyPending, reasonConflictScopes, msg, metav1.ConditionFalse)
+				ctrl.syncImagePolicyStatusOnly(namespace, imagePolicy.ObjectMeta.Name, apicfgv1.ImagePolicyPending, reasonConflictScopes, msg, metav1.ConditionFalse)
 			}
 		}
 	}

pkg/controller/container-runtime-config/container_runtime_config_controller_test.go

@@ -30,7 +30,6 @@ import (
 
 	ign3types "github.com/coreos/ignition/v2/config/v3_5/types"
 	apicfgv1 "github.com/openshift/api/config/v1"
-	apicfgv1alpha1 "github.com/openshift/api/config/v1alpha1"
 	features "github.com/openshift/api/features"
 	mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
 	apioperatorsv1alpha1 "github.com/openshift/api/operator/v1alpha1"
@@ -217,7 +216,7 @@ func newClusterImagePolicyWithPublicKey(name string, scopes []string, keyData []
 		imgScopes = append(imgScopes, apicfgv1.ImageScope(scope))
 	}
 	return &apicfgv1.ClusterImagePolicy{
-		TypeMeta:   metav1.TypeMeta{APIVersion: apicfgv1alpha1.SchemeGroupVersion.String()},
+		TypeMeta:   metav1.TypeMeta{APIVersion: apicfgv1.SchemeGroupVersion.String()},
 		ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5)), Generation: 1},
 		Spec: apicfgv1.ClusterImagePolicySpec{
 			Scopes: imgScopes,
@@ -239,7 +238,7 @@ func newImagePolicyWithPublicKey(name, namespace string, scopes []string, keyDat
 		imgScopes = append(imgScopes, apicfgv1.ImageScope(scope))
 	}
 	return &apicfgv1.ImagePolicy{
-		TypeMeta:   metav1.TypeMeta{APIVersion: apicfgv1alpha1.SchemeGroupVersion.String()},
+		TypeMeta:   metav1.TypeMeta{APIVersion: apicfgv1.SchemeGroupVersion.String()},
 		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace, UID: types.UID(utilrand.String(5)), Generation: 1},
 		Spec: apicfgv1.ImagePolicySpec{
 			Scopes: imgScopes,

pkg/controller/container-runtime-config/helpers.go

@@ -23,7 +23,6 @@ import (
 	"github.com/ghodss/yaml"
 	"github.com/opencontainers/go-digest"
 	apicfgv1 "github.com/openshift/api/config/v1"
-	apicfgv1alpha1 "github.com/openshift/api/config/v1alpha1"
 	apioperatorsv1alpha1 "github.com/openshift/api/operator/v1alpha1"
 	"github.com/openshift/runtime-utils/pkg/registries"
 	runtimeutils "github.com/openshift/runtime-utils/pkg/registries"
@@ -900,13 +899,13 @@ func policyItemFromSpec(policy apicfgv1.Policy) (signature.PolicyRequirement, er
 		case apicfgv1.IdentityMatchPolicyRemapIdentity:
 			identity, err := signature.NewPRMRemapIdentity(string(policy.SignedIdentity.PolicyMatchRemapIdentity.Prefix), string(policy.SignedIdentity.PolicyMatchRemapIdentity.SignedPrefix))
 			if err != nil {
-				return nil, fmt.Errorf("error getting signedIdentity for %s: %v", apicfgv1alpha1.IdentityMatchPolicyRemapIdentity, err)
+				return nil, fmt.Errorf("error getting signedIdentity for %s: %v", apicfgv1.IdentityMatchPolicyRemapIdentity, err)
 			}
 			signedIdentity = identity
 		case apicfgv1.IdentityMatchPolicyExactRepository:
 			identity, err := signature.NewPRMExactRepository(string(policy.SignedIdentity.PolicyMatchExactRepository.Repository))
 			if err != nil {
-				return nil, fmt.Errorf("error getting signedIdentity for %s: %v", apicfgv1alpha1.IdentityMatchPolicyExactRepository, err)
+				return nil, fmt.Errorf("error getting signedIdentity for %s: %v", apicfgv1.IdentityMatchPolicyExactRepository, err)
 			}
 			signedIdentity = identity
 		case apicfgv1.IdentityMatchPolicyMatchRepository: