55 "fmt"
66 "testing"
77 "time"
8+ "encoding/json"
89
910 "github.com/ghodss/yaml"
1011 "github.com/sirupsen/logrus"
@@ -19,6 +20,8 @@ import (
1920 k8sfake "k8s.io/client-go/kubernetes/fake"
2021 "k8s.io/client-go/tools/cache"
2122 apiregistrationfake "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake"
23+ appsv1 "k8s.io/api/apps/v1"
24+ rbacv1 "k8s.io/api/rbac/v1"
2225
2326 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
2427 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/fake"
@@ -113,6 +116,98 @@ func TestTransitionInstallPlan(t *testing.T) {
113116 }
114117}
115118
119+ func TestExecutePlan (t * testing.T ) {
120+ namespace := "ns"
121+
122+ tests := []struct {
123+ testName string
124+ in * v1alpha1.InstallPlan
125+ want []runtime.Object
126+ err error
127+ }{
128+ {
129+ testName : "NoSteps" ,
130+ in : installPlan ("p" , namespace , v1alpha1 .InstallPlanPhaseInstalling ),
131+ want : []runtime.Object {},
132+ err : nil ,
133+ },
134+ {
135+ testName : "MultipleSteps" ,
136+ in : withSteps (installPlan ("p" , namespace , v1alpha1 .InstallPlanPhaseInstalling , "csv" ),
137+ []* v1alpha1.Step {
138+ & v1alpha1.Step {
139+ Resource : v1alpha1.StepResource {
140+ CatalogSource : "catalog" ,
141+ CatalogSourceNamespace : namespace ,
142+ Group : "" ,
143+ Version : "v1" ,
144+ Kind : "Service" ,
145+ Name : "service" ,
146+ Manifest : toManifest (service ("service" , namespace )),
147+ },
148+ Status : v1alpha1 .StepStatusUnknown ,
149+ },
150+ & v1alpha1.Step {
151+ Resource : v1alpha1.StepResource {
152+ CatalogSource : "catalog" ,
153+ CatalogSourceNamespace : namespace ,
154+ Group : "operators.coreos.com" ,
155+ Version : "v1alpha1" ,
156+ Kind : "ClusterServiceVersion" ,
157+ Name : "csv" ,
158+ Manifest : toManifest (csv ("csv" , namespace , nil , nil )),
159+ },
160+ Status : v1alpha1 .StepStatusUnknown ,
161+ },
162+ },
163+ ),
164+ want : []runtime.Object {service ("service" , namespace ), csv ("csv" , namespace , nil , nil )},
165+ err : nil ,
166+ },
167+ }
168+
169+ for _ , tt := range tests {
170+ t .Run (tt .testName , func (t * testing.T ) {
171+ stopCh := make (chan struct {})
172+ defer func () { stopCh <- struct {}{} }()
173+ op , _ , err := NewFakeOperator ([]runtime.Object {tt .in }, nil , nil , nil , namespace , stopCh )
174+ require .NoError (t , err )
175+
176+ err = op .ExecutePlan (tt .in )
177+ require .Equal (t , tt .err , err )
178+
179+ for _ , obj := range tt .want {
180+ var err error
181+ var fetched runtime.Object
182+ switch o := obj .(type ) {
183+ case * appsv1.Deployment :
184+ fetched , err = op .OpClient .GetDeployment (namespace , o .GetName ())
185+ case * rbacv1.ClusterRole :
186+ fetched , err = op .OpClient .GetClusterRole (o .GetName ())
187+ case * rbacv1.Role :
188+ fetched , err = op .OpClient .GetRole (namespace , o .GetName ())
189+ case * rbacv1.ClusterRoleBinding :
190+ fetched , err = op .OpClient .GetClusterRoleBinding (o .GetName ())
191+ case * rbacv1.RoleBinding :
192+ fetched , err = op .OpClient .GetRoleBinding (namespace , o .GetName ())
193+ case * corev1.ServiceAccount :
194+ fetched , err = op .OpClient .GetServiceAccount (namespace , o .GetName ())
195+ case * corev1.Service :
196+ fetched , err = op .OpClient .GetService (namespace , o .GetName ())
197+ case * v1alpha1.ClusterServiceVersion :
198+ fetched , err = op .client .OperatorsV1alpha1 ().ClusterServiceVersions (namespace ).Get (o .GetName (), metav1.GetOptions {})
199+ default :
200+ require .Failf (t , "couldn't find expected object" , "%#v" , obj )
201+ }
202+
203+ require .NoError (t , err , "couldn't fetch %s %v" , namespace , obj )
204+ fmt .Printf ("fetched: %v" , fetched )
205+ require .EqualValues (t , obj , fetched )
206+ }
207+ })
208+ }
209+ }
210+
116211func TestSyncCatalogSources (t * testing.T ) {
117212 tests := []struct {
118213 testName string
@@ -284,21 +379,21 @@ func TestCompetingCRDOwnersExist(t *testing.T) {
284379 testNamespace := "default"
285380 tests := []struct {
286381 name string
287- csv v1alpha1.ClusterServiceVersion
382+ csv * v1alpha1.ClusterServiceVersion
288383 existingCRDOwners map [string ][]string
289384 expectedErr error
290385 expectedResult bool
291386 }{
292387 {
293388 name : "NoCompetingOwnersExist" ,
294- csv : csv ("turkey" , []string {"feathers" }, nil ),
389+ csv : csv ("turkey" , testNamespace , []string {"feathers" }, nil ),
295390 existingCRDOwners : nil ,
296391 expectedErr : nil ,
297392 expectedResult : false ,
298393 },
299394 {
300395 name : "OnlyCompetingWithSelf" ,
301- csv : csv ("turkey" , []string {"feathers" }, nil ),
396+ csv : csv ("turkey" , testNamespace , []string {"feathers" }, nil ),
302397 existingCRDOwners : map [string ][]string {
303398 "feathers" : {"turkey" },
304399 },
@@ -307,7 +402,7 @@ func TestCompetingCRDOwnersExist(t *testing.T) {
307402 },
308403 {
309404 name : "CompetingOwnersExist" ,
310- csv : csv ("turkey" , []string {"feathers" }, nil ),
405+ csv : csv ("turkey" , testNamespace , []string {"feathers" }, nil ),
311406 existingCRDOwners : map [string ][]string {
312407 "feathers" : {"seagull" },
313408 },
@@ -316,7 +411,7 @@ func TestCompetingCRDOwnersExist(t *testing.T) {
316411 },
317412 {
318413 name : "CompetingOwnerExistsOnSecondCRD" ,
319- csv : csv ("turkey" , []string {"feathers" , "beak" }, nil ),
414+ csv : csv ("turkey" , testNamespace , []string {"feathers" , "beak" }, nil ),
320415 existingCRDOwners : map [string ][]string {
321416 "milk" : {"cow" },
322417 "beak" : {"squid" },
@@ -326,7 +421,7 @@ func TestCompetingCRDOwnersExist(t *testing.T) {
326421 },
327422 {
328423 name : "MoreThanOneCompetingOwnerExists" ,
329- csv : csv ("turkey" , []string {"feathers" }, nil ),
424+ csv : csv ("turkey" , testNamespace , []string {"feathers" }, nil ),
330425 existingCRDOwners : map [string ][]string {
331426 "feathers" : {"seagull" , "turkey" },
332427 },
@@ -338,7 +433,7 @@ func TestCompetingCRDOwnersExist(t *testing.T) {
338433 t .Run (tt .name , func (t * testing.T ) {
339434 t .Parallel ()
340435
341- competing , err := competingCRDOwnersExist (testNamespace , & tt .csv , tt .existingCRDOwners )
436+ competing , err := competingCRDOwnersExist (testNamespace , tt .csv , tt .existingCRDOwners )
342437
343438 // Assert the error is as expected
344439 if tt .expectedErr == nil {
@@ -440,31 +535,48 @@ func NewFakeOperator(clientObjs []runtime.Object, k8sObjs []runtime.Object, extO
440535 return op , hasSyncedCheckFns , nil
441536}
442537
443- func installPlan (names ... string ) v1alpha1.InstallPlan {
444- return v1alpha1.InstallPlan {
538+ func installPlan (name , namespace string , phase v1alpha1.InstallPlanPhase , names ... string ) * v1alpha1.InstallPlan {
539+ return & v1alpha1.InstallPlan {
540+ ObjectMeta : metav1.ObjectMeta {
541+ Name : name ,
542+ Namespace : namespace ,
543+ },
445544 Spec : v1alpha1.InstallPlanSpec {
446545 ClusterServiceVersionNames : names ,
447546 },
448547 Status : v1alpha1.InstallPlanStatus {
548+ Phase : phase ,
449549 Plan : []* v1alpha1.Step {},
450550 },
451551 }
452552}
453553
454- func csv (name string , owned , required []string ) v1alpha1.ClusterServiceVersion {
554+ func withSteps (plan * v1alpha1.InstallPlan , steps []* v1alpha1.Step ) * v1alpha1.InstallPlan {
555+ plan .Status .Plan = steps
556+ return plan
557+ }
558+
559+ func csv (name , namespace string , owned , required []string ) * v1alpha1.ClusterServiceVersion {
455560 requiredCRDDescs := make ([]v1alpha1.CRDDescription , 0 )
456561 for _ , name := range required {
457562 requiredCRDDescs = append (requiredCRDDescs , v1alpha1.CRDDescription {Name : name , Version : "v1" , Kind : name })
458563 }
564+ if len (requiredCRDDescs ) == 0 {
565+ requiredCRDDescs = nil
566+ }
459567
460568 ownedCRDDescs := make ([]v1alpha1.CRDDescription , 0 )
461569 for _ , name := range owned {
462570 ownedCRDDescs = append (ownedCRDDescs , v1alpha1.CRDDescription {Name : name , Version : "v1" , Kind : name })
463571 }
572+ if len (ownedCRDDescs ) == 0 {
573+ ownedCRDDescs = nil
574+ }
464575
465- return v1alpha1.ClusterServiceVersion {
576+ return & v1alpha1.ClusterServiceVersion {
466577 ObjectMeta : metav1.ObjectMeta {
467578 Name : name ,
579+ Namespace : namespace ,
468580 },
469581 Spec : v1alpha1.ClusterServiceVersionSpec {
470582 CustomResourceDefinitions : v1alpha1.CustomResourceDefinitions {
@@ -489,3 +601,17 @@ func crd(name string) v1beta1.CustomResourceDefinition {
489601 },
490602 }
491603}
604+
605+ func service (name , namespace string ) * corev1.Service {
606+ return & corev1.Service {
607+ ObjectMeta : metav1.ObjectMeta {
608+ Name : name ,
609+ Namespace : namespace ,
610+ },
611+ }
612+ }
613+
614+ func toManifest (obj runtime.Object ) string {
615+ raw , _ := json .Marshal (obj )
616+ return string (raw )
617+ }
0 commit comments