Merge pull request #9933 from mhanss/update-icsp

OCPBUGS-61490: Update code to retrieve ICSP instead of ICP

Author: openshift-merge-bot[bot]

pkg/asset/agent/joiner/clusterinfo.go

@@ -26,6 +26,7 @@ import (
 	"github.com/openshift/assisted-service/models"
 	configclient "github.com/openshift/client-go/config/clientset/versioned"
 	machineconfigclient "github.com/openshift/client-go/machineconfiguration/clientset/versioned"
+	operatorclient "github.com/openshift/client-go/operator/clientset/versioned"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent"
 	"github.com/openshift/installer/pkg/asset/agent/workflow"
@@ -51,6 +52,7 @@ import (
 type ClusterInfo struct {
 	Client                       kubernetes.Interface
 	OpenshiftClient              configclient.Interface
+	OpenshiftOperatorClient      operatorclient.Interface
 	OpenshiftMachineConfigClient machineconfigclient.Interface
 	addNodesConfig               AddNodesConfig
 
@@ -118,7 +120,7 @@ func (ci *ClusterInfo) Generate(ctx context.Context, dependencies asset.Parents)
 		ci.retrieveUserTrustBundle,
 		ci.retrieveArchitecture,
 		ci.retrieveImageDigestMirrorSets,
-		ci.retrieveImageContentPolicies,
+		ci.retrieveImageContentSourcePolicies,
 		ci.retrieveOsImage,
 		ci.retrieveIgnitionEndpointWorker,
 		ci.retrievePlatformType,
@@ -142,7 +144,7 @@ func (ci *ClusterInfo) Generate(ctx context.Context, dependencies asset.Parents)
 }
 
 func (ci *ClusterInfo) initClients() error {
-	if ci.Client != nil && ci.OpenshiftClient != nil {
+	if ci.Client != nil && ci.OpenshiftClient != nil && ci.OpenshiftOperatorClient != nil {
 		return nil
 	}
 
@@ -164,6 +166,12 @@ func (ci *ClusterInfo) initClients() error {
 	}
 	ci.OpenshiftClient = openshiftClient
 
+	operatorClient, err := operatorclient.NewForConfig(config)
+	if err != nil {
+		return err
+	}
+	ci.OpenshiftOperatorClient = operatorClient
+
 	openshiftMachineConfigClient, err := machineconfigclient.NewForConfig(config)
 	if err != nil {
 		return err
@@ -429,8 +437,8 @@ func (ci *ClusterInfo) retrieveImageDigestMirrorSets() error {
 	return nil
 }
 
-func (ci *ClusterInfo) retrieveImageContentPolicies() error {
-	imageContentPolicies, err := ci.OpenshiftClient.ConfigV1().ImageContentPolicies().List(context.Background(), metav1.ListOptions{})
+func (ci *ClusterInfo) retrieveImageContentSourcePolicies() error {
+	imageContentSourcePolicies, err := ci.OpenshiftOperatorClient.OperatorV1alpha1().ImageContentSourcePolicies().List(context.Background(), metav1.ListOptions{})
 	if err != nil {
 		// Older oc client may not have sufficient permissions,
 		// falling back to previous implementation.
@@ -451,14 +459,12 @@ func (ci *ClusterInfo) retrieveImageContentPolicies() error {
 		return nil
 	}
 
-	for _, icp := range imageContentPolicies.Items {
-		for _, digestMirror := range icp.Spec.RepositoryDigestMirrors {
+	for _, icsp := range imageContentSourcePolicies.Items {
+		for _, digestMirror := range icsp.Spec.RepositoryDigestMirrors {
 			digestSource := types.ImageContentSource{
 				Source: digestMirror.Source,
 			}
-			for _, m := range digestMirror.Mirrors {
-				digestSource.Mirrors = append(digestSource.Mirrors, string(m))
-			}
+			digestSource.Mirrors = append(digestSource.Mirrors, digestMirror.Mirrors...)
 			ci.DeprecatedImageContentSources = append(ci.DeprecatedImageContentSources, digestSource)
 		}
 	}

pkg/asset/agent/joiner/clusterinfo_test.go

@@ -26,6 +26,7 @@ import (
 	"github.com/openshift/assisted-service/models"
 	fakeclientconfig "github.com/openshift/client-go/config/clientset/versioned/fake"
 	fakeclientmachineconfig "github.com/openshift/client-go/machineconfiguration/clientset/versioned/fake"
+	fakeoperatorconfig "github.com/openshift/client-go/operator/clientset/versioned/fake"
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/asset/agent/workflow"
 	"github.com/openshift/installer/pkg/types"
@@ -169,7 +170,7 @@ storage:
 			objs:     defaultObjects(),
 			fakeClientError: &fakeClientErr{
 				verb:     "list",
-				resource: "imagecontentpolicies",
+				resource: "imagecontentsourcepolicies",
 				err:      errors.NewForbidden(schema.GroupResource{}, "", nil),
 			},
 		},
@@ -266,6 +267,7 @@ passwd:
 			}
 			fakeClient := fake.NewSimpleClientset(objects...)
 			fakeOCClient := fakeclientconfig.NewSimpleClientset(openshiftObjects...)
+			fakeOperatorClient := fakeoperatorconfig.NewSimpleClientset()
 			fakeOCMachineConfigClient := fakeclientmachineconfig.NewSimpleClientset(openshiftMachineConfigObjects...)
 
 			if tc.fakeClientError != nil {
@@ -282,7 +284,7 @@ passwd:
 						}
 						return false, nil, nil
 					})
-				case "imagedigestmirrorsets", "imagecontentpolicies":
+				case "imagedigestmirrorsets":
 					fakeOCClient.PrependReactor(tc.fakeClientError.verb, tc.fakeClientError.resource, func(action faketesting.Action) (handled bool, ret runtime.Object, err error) {
 						listAction, ok := action.(faketesting.ListAction)
 						if ok && listAction.GetResource().Resource == tc.fakeClientError.resource {
@@ -294,12 +296,25 @@ passwd:
 						}
 						return false, nil, nil
 					})
+				case "imagecontentsourcepolicies":
+					fakeOperatorClient.Fake.PrependReactor(tc.fakeClientError.verb, tc.fakeClientError.resource, func(action faketesting.Action) (handled bool, ret runtime.Object, err error) {
+						listAction, ok := action.(faketesting.ListAction)
+						if ok && listAction.GetResource().Resource == tc.fakeClientError.resource {
+							return true, nil, errors.NewForbidden(
+								schema.GroupResource{Group: "", Resource: tc.fakeClientError.resource},
+								tc.fakeClientError.name,
+								fmt.Errorf("access denied"),
+							)
+						}
+						return false, nil, nil
+					})
 				}
 			}
 
 			clusterInfo := ClusterInfo{
 				Client:                       fakeClient,
 				OpenshiftClient:              fakeOCClient,
+				OpenshiftOperatorClient:      fakeOperatorClient,
 				OpenshiftMachineConfigClient: fakeOCMachineConfigClient,
 			}
 			err := clusterInfo.Generate(context.Background(), parents)