@@ -29,7 +29,11 @@ func (o *OLMVariableSource) GetVariables(ctx context.Context, entitySource input
29
29
30
30
// build required package variable sources
31
31
for _ , operator := range o .operators {
32
- rps , err := o .requiredPackageFromOperator (& operator )
32
+ rps , err := required_package .NewRequiredPackage (
33
+ operator .Spec .PackageName ,
34
+ required_package .InVersionRange (operator .Spec .Version ),
35
+ required_package .InChannel (operator .Spec .Channel ),
36
+ )
33
37
if err != nil {
34
38
return nil , err
35
39
}
@@ -40,14 +44,3 @@ func (o *OLMVariableSource) GetVariables(ctx context.Context, entitySource input
40
44
variableSource := crd_constraints .NewCRDUniquenessConstraintsVariableSource (bundles_and_dependencies .NewBundlesAndDepsVariableSource (inputVariableSources ... ))
41
45
return variableSource .GetVariables (ctx , entitySource )
42
46
}
43
-
44
- func (o * OLMVariableSource ) requiredPackageFromOperator (operator * operatorsv1alpha1.Operator ) (* required_package.RequiredPackageVariableSource , error ) {
45
- var opts []required_package.RequiredPackageOption
46
- if operator .Spec .Version != "" {
47
- opts = append (opts , required_package .InVersionRange (operator .Spec .Version ))
48
- }
49
- if operator .Spec .Channel != "" {
50
- opts = append (opts , required_package .InChannel (operator .Spec .Channel ))
51
- }
52
- return required_package .NewRequiredPackage (operator .Spec .PackageName , opts ... )
53
- }
0 commit comments