@@ -298,13 +298,14 @@ func NewFakeOperator(ctx context.Context, options ...fakeOperatorOption) (*Opera
298298 * config .actionLog = append (* config .actionLog , action )
299299 return false , nil , nil
300300 }))
301- config .operatorClient = operatorclient .NewClient (k8sClientFake , apiextensionsfake .NewSimpleClientset (config .extObjs ... ), apiregistrationfake .NewSimpleClientset (config .regObjs ... ))
301+ apiextensionsFake := apiextensionsfake .NewSimpleClientset (config .extObjs ... )
302+ config .operatorClient = operatorclient .NewClient (k8sClientFake , apiextensionsFake , apiregistrationfake .NewSimpleClientset (config .regObjs ... ))
302303 config .configClient = configfake .NewSimpleClientset ()
303304 metadataFake := metadatafake .NewSimpleMetadataClient (scheme , config .partialMetadata ... )
304305 config .metadataClient = metadataFake
305306 // It's a travesty that we need to do this, but the fakes leave us no other option. In the API server, of course
306307 // changes to objects are transparently exposed in the metadata client. In fake-land, we need to enforce that ourselves.
307- externalFake . PrependReactor ( "*" , "*" , func (action clienttesting.Action ) (bool , runtime.Object , error ) {
308+ propagate := func (action clienttesting.Action ) (bool , runtime.Object , error ) {
308309 var err error
309310 switch action .GetVerb () {
310311 case "create" :
@@ -320,7 +321,9 @@ func NewFakeOperator(ctx context.Context, options ...fakeOperatorOption) (*Opera
320321 err = metadataFake .Resource (action .GetResource ()).Delete (context .TODO (), a .GetName (), metav1.DeleteOptions {})
321322 }
322323 return false , nil , err
323- })
324+ }
325+ externalFake .PrependReactor ("*" , "*" , propagate )
326+ apiextensionsFake .PrependReactor ("*" , "*" , propagate )
324327
325328 for _ , ns := range config .namespaces {
326329 _ , err := config .operatorClient .KubernetesInterface ().CoreV1 ().Namespaces ().Create (context .TODO (), & corev1.Namespace {ObjectMeta : metav1.ObjectMeta {Name : ns }}, metav1.CreateOptions {})
@@ -4397,7 +4400,7 @@ func TestSyncOperatorGroups(t *testing.T) {
43974400 operatorGroup * operatorsv1.OperatorGroup
43984401 csvs []* v1alpha1.ClusterServiceVersion
43994402 clientObjs []runtime.Object
4400- crds []runtime. Object
4403+ crds []* apiextensionsv1. CustomResourceDefinition
44014404 k8sObjs []runtime.Object
44024405 apis []runtime.Object
44034406 }
@@ -4474,7 +4477,7 @@ func TestSyncOperatorGroups(t *testing.T) {
44744477 role ,
44754478 roleBinding ,
44764479 },
4477- crds : []runtime. Object {crd },
4480+ crds : []* apiextensionsv1. CustomResourceDefinition {crd },
44784481 },
44794482 expectedStatus : operatorsv1.OperatorGroupStatus {},
44804483 final : final {objects : map [string ][]runtime.Object {
@@ -4553,7 +4556,7 @@ func TestSyncOperatorGroups(t *testing.T) {
45534556 role ,
45544557 roleBinding ,
45554558 },
4556- crds : []runtime. Object {crd },
4559+ crds : []* apiextensionsv1. CustomResourceDefinition {crd },
45574560 },
45584561 expectedStatus : operatorsv1.OperatorGroupStatus {
45594562 Namespaces : []string {operatorNamespace , targetNamespace },
@@ -4656,7 +4659,7 @@ func TestSyncOperatorGroups(t *testing.T) {
46564659 role ,
46574660 roleBinding ,
46584661 },
4659- crds : []runtime. Object {crd },
4662+ crds : []* apiextensionsv1. CustomResourceDefinition {crd },
46604663 },
46614664 expectedStatus : operatorsv1.OperatorGroupStatus {
46624665 Namespaces : []string {operatorNamespace , targetNamespace },
@@ -4762,7 +4765,7 @@ func TestSyncOperatorGroups(t *testing.T) {
47624765 role ,
47634766 roleBinding ,
47644767 },
4765- crds : []runtime. Object {crd },
4768+ crds : []* apiextensionsv1. CustomResourceDefinition {crd },
47664769 },
47674770 expectedStatus : operatorsv1.OperatorGroupStatus {
47684771 Namespaces : []string {corev1 .NamespaceAll },
@@ -4925,7 +4928,7 @@ func TestSyncOperatorGroups(t *testing.T) {
49254928 role ,
49264929 roleBinding ,
49274930 },
4928- crds : []runtime. Object {crd },
4931+ crds : []* apiextensionsv1. CustomResourceDefinition {crd },
49294932 },
49304933 expectedStatus : operatorsv1.OperatorGroupStatus {
49314934 Namespaces : []string {corev1 .NamespaceAll },
@@ -4982,7 +4985,7 @@ func TestSyncOperatorGroups(t *testing.T) {
49824985 operatorGroup = tt .initial .operatorGroup .DeepCopy ()
49834986 clientObjs = copyObjs (append (tt .initial .clientObjs , operatorGroup ))
49844987 k8sObjs = copyObjs (tt .initial .k8sObjs )
4985- extObjs = copyObjs ( tt . initial . crds )
4988+ extObjs []runtime. Object
49864989 regObjs = copyObjs (tt .initial .apis )
49874990 )
49884991
@@ -4992,11 +4995,25 @@ func TestSyncOperatorGroups(t *testing.T) {
49924995
49934996 var partials []runtime.Object
49944997 for _ , csv := range tt .initial .csvs {
4995- clientObjs = append (clientObjs , csv )
4998+ clientObjs = append (clientObjs , csv . DeepCopy () )
49964999 partials = append (partials , & metav1.PartialObjectMetadata {
5000+ TypeMeta : metav1.TypeMeta {
5001+ Kind : "ClusterServiceVersion" ,
5002+ APIVersion : v1alpha1 .SchemeGroupVersion .String (),
5003+ },
49975004 ObjectMeta : csv .ObjectMeta ,
49985005 })
49995006 }
5007+ for _ , crd := range tt .initial .crds {
5008+ extObjs = append (extObjs , crd .DeepCopy ())
5009+ partials = append (partials , & metav1.PartialObjectMetadata {
5010+ TypeMeta : metav1.TypeMeta {
5011+ Kind : "CustomResourceDefinition" ,
5012+ APIVersion : apiextensionsv1 .SchemeGroupVersion .String (),
5013+ },
5014+ ObjectMeta : crd .ObjectMeta ,
5015+ })
5016+ }
50005017 l := logrus .New ()
50015018 l .SetLevel (logrus .DebugLevel )
50025019 l = l .WithField ("test" , tt .name ).Logger
@@ -5094,12 +5111,12 @@ func TestSyncOperatorGroups(t *testing.T) {
50945111
50955112 t .Log ("op.syncClusterServiceVersion" )
50965113 if err := op .syncClusterServiceVersion (& csv ); err != nil {
5097- return false , err
5114+ return false , fmt . Errorf ( "failed to syncClusterServiceVersion: %w" , err )
50985115 }
50995116
51005117 t .Log ("op.syncCopyCSV" )
51015118 if err := op .syncCopyCSV (& csv ); err != nil && ! tt .ignoreCopyError {
5102- return false , err
5119+ return false , fmt . Errorf ( "failed to syncCopyCSV: %w" , err )
51035120 }
51045121 }
51055122
0 commit comments