fix: changes Catalog Source API version to v1alpha1 (#341)

Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com>
openshift · Mar 1, 2022 · ee792e1 · ee792e1
1 parent 30a0663
commit ee792e1
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/pkg/cli/mirror/manifests.go b/pkg/cli/mirror/manifests.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	operatorv1alpha2 "github.com/openshift/api/operator/v1alpha1"
+	operatorv1alpha1 "github.com/openshift/api/operator/v1alpha1"
 	"github.com/openshift/library-go/pkg/image/reference"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
@@ -29,29 +29,29 @@ const (
 )
 
 var icspTypeMeta = metav1.TypeMeta{
-	APIVersion: operatorv1alpha2.GroupVersion.String(),
+	APIVersion: operatorv1alpha1.GroupVersion.String(),
 	Kind:       icspKind,
 }
 
 // ICSPBuilder defines methods for generating ICSPs
 type ICSPBuilder interface {
-	New(string, int) operatorv1alpha2.ImageContentSourcePolicy
+	New(string, int) operatorv1alpha1.ImageContentSourcePolicy
 	GetMapping(string, image.TypedImageMapping) (map[string]string, error)
 }
 
 var _ ICSPBuilder = &ReleaseBuilder{}
 
 type ReleaseBuilder struct{}
 
-func (b *ReleaseBuilder) New(icspName string, icspCount int) operatorv1alpha2.ImageContentSourcePolicy {
+func (b *ReleaseBuilder) New(icspName string, icspCount int) operatorv1alpha1.ImageContentSourcePolicy {
 	name := strings.Join(strings.Split(icspName, "/"), "-") + "-" + strconv.Itoa(icspCount)
-	return operatorv1alpha2.ImageContentSourcePolicy{
+	return operatorv1alpha1.ImageContentSourcePolicy{
 		TypeMeta: icspTypeMeta,
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
-		Spec: operatorv1alpha2.ImageContentSourcePolicySpec{
-			RepositoryDigestMirrors: []operatorv1alpha2.RepositoryDigestMirrors{},
+		Spec: operatorv1alpha1.ImageContentSourcePolicySpec{
+			RepositoryDigestMirrors: []operatorv1alpha1.RepositoryDigestMirrors{},
 		},
 	}
 }
@@ -67,16 +67,16 @@ var _ ICSPBuilder = &OperatorBuilder{}
 
 type OperatorBuilder struct{}
 
-func (b *OperatorBuilder) New(icspName string, icspCount int) operatorv1alpha2.ImageContentSourcePolicy {
+func (b *OperatorBuilder) New(icspName string, icspCount int) operatorv1alpha1.ImageContentSourcePolicy {
 	name := strings.Join(strings.Split(icspName, "/"), "-") + "-" + strconv.Itoa(icspCount)
-	return operatorv1alpha2.ImageContentSourcePolicy{
+	return operatorv1alpha1.ImageContentSourcePolicy{
 		TypeMeta: icspTypeMeta,
 		ObjectMeta: metav1.ObjectMeta{
 			Name:   name,
 			Labels: map[string]string{"operators.openshift.org/catalog": "true"},
 		},
-		Spec: operatorv1alpha2.ImageContentSourcePolicySpec{
-			RepositoryDigestMirrors: []operatorv1alpha2.RepositoryDigestMirrors{},
+		Spec: operatorv1alpha1.ImageContentSourcePolicySpec{
+			RepositoryDigestMirrors: []operatorv1alpha1.RepositoryDigestMirrors{},
 		},
 	}
 }
@@ -89,15 +89,15 @@ var _ ICSPBuilder = &GenericBuilder{}
 
 type GenericBuilder struct{}
 
-func (b *GenericBuilder) New(icspName string, icspCount int) operatorv1alpha2.ImageContentSourcePolicy {
+func (b *GenericBuilder) New(icspName string, icspCount int) operatorv1alpha1.ImageContentSourcePolicy {
 	name := strings.Join(strings.Split(icspName, "/"), "-") + "-" + strconv.Itoa(icspCount)
-	return operatorv1alpha2.ImageContentSourcePolicy{
+	return operatorv1alpha1.ImageContentSourcePolicy{
 		TypeMeta: icspTypeMeta,
 		ObjectMeta: metav1.ObjectMeta{
 			Name: name,
 		},
-		Spec: operatorv1alpha2.ImageContentSourcePolicySpec{
-			RepositoryDigestMirrors: []operatorv1alpha2.RepositoryDigestMirrors{},
+		Spec: operatorv1alpha1.ImageContentSourcePolicySpec{
+			RepositoryDigestMirrors: []operatorv1alpha1.RepositoryDigestMirrors{},
 		},
 	}
 }
@@ -107,7 +107,7 @@ func (b *GenericBuilder) GetMapping(icspScope string, mapping image.TypedImageMa
 }
 
 // GenerateICSP will generate ImageContentSourcePolicy objects based on image mapping and an ICSPBuilder
-func GenerateICSP(icspName, icspScope string, byteLimit int, mapping image.TypedImageMapping, builder ICSPBuilder) (icsps []operatorv1alpha2.ImageContentSourcePolicy, err error) {
+func GenerateICSP(icspName, icspScope string, byteLimit int, mapping image.TypedImageMapping, builder ICSPBuilder) (icsps []operatorv1alpha1.ImageContentSourcePolicy, err error) {
 	registryMapping, err := builder.GetMapping(icspScope, mapping)
 	if err != nil {
 		return nil, err
@@ -119,7 +119,7 @@ func GenerateICSP(icspName, icspScope string, byteLimit int, mapping image.Typed
 		icsp := builder.New(icspName, icspCount)
 
 		for key := range registryMapping {
-			icsp.Spec.RepositoryDigestMirrors = append(icsp.Spec.RepositoryDigestMirrors, operatorv1alpha2.RepositoryDigestMirrors{
+			icsp.Spec.RepositoryDigestMirrors = append(icsp.Spec.RepositoryDigestMirrors, operatorv1alpha1.RepositoryDigestMirrors{
 				Source:  key,
 				Mirrors: []string{registryMapping[key]},
 			})
@@ -191,7 +191,7 @@ func generateCatalogSource(name string, dest reference.DockerImageReference) ([]
 	}
 
 	obj := map[string]interface{}{
-		"apiVersion": "operators.coreos.com/v1alpha2",
+		"apiVersion": "operators.coreos.com/v1alpha1",
 		"kind":       "CatalogSource",
 		"metadata": map[string]interface{}{
 			"name":      name,
@@ -211,7 +211,7 @@ func generateCatalogSource(name string, dest reference.DockerImageReference) ([]
 }
 
 // WriteICSPs will write provided ImageContentSourcePolicy objects to disk
-func WriteICSPs(dir string, icsps []operatorv1alpha2.ImageContentSourcePolicy) error {
+func WriteICSPs(dir string, icsps []operatorv1alpha1.ImageContentSourcePolicy) error {
 
 	if len(icsps) == 0 {
 		logrus.Debug("No ICSPs generated to write")