@@ -36,26 +36,30 @@ func (c operatorClient) GetSubscriptionData(catalogSource string, catalogSourceN
36
36
SubscriptionList := []SubscriptionData {}
37
37
38
38
for _ , pkgm := range packageManifests .Items {
39
- if pkgm .Status .CatalogSource == catalogSource {
40
- for _ , pkgch := range pkgm .Status .Channels {
41
- if pkgch .IsDefaultChannel (pkgm ) {
42
- for _ , installMode := range pkgch .CurrentCSVDesc .InstallModes {
43
- if installMode .Supported {
44
- s := SubscriptionData {
45
- Name : strings .Join ([]string {pkgch .Name , pkgm .Name , "subscription" }, "-" ),
46
- Channel : pkgch .Name ,
47
- CatalogSource : catalogSource ,
48
- CatalogSourceNamespace : catalogSourceNamespace ,
49
- Package : pkgm .Name ,
50
- InstallModeType : installMode .Type ,
51
- InstallPlanApproval : operatorv1alpha1 .ApprovalAutomatic ,
52
- }
53
-
54
- SubscriptionList = append (SubscriptionList , s )
55
- break
56
- }
57
- }
39
+ if pkgm .Status .CatalogSource != catalogSource {
40
+ continue
41
+ }
42
+ for _ , pkgch := range pkgm .Status .Channels {
43
+ if ! pkgch .IsDefaultChannel (pkgm ) {
44
+ continue
45
+ }
46
+ for _ , installMode := range pkgch .CurrentCSVDesc .InstallModes {
47
+ if ! installMode .Supported {
48
+ continue
58
49
}
50
+
51
+ s := SubscriptionData {
52
+ Name : strings .Join ([]string {pkgch .Name , pkgm .Name , "subscription" }, "-" ),
53
+ Channel : pkgch .Name ,
54
+ CatalogSource : catalogSource ,
55
+ CatalogSourceNamespace : catalogSourceNamespace ,
56
+ Package : pkgm .Name ,
57
+ InstallModeType : installMode .Type ,
58
+ InstallPlanApproval : operatorv1alpha1 .ApprovalAutomatic ,
59
+ }
60
+
61
+ SubscriptionList = append (SubscriptionList , s )
62
+ break
59
63
}
60
64
}
61
65
}
@@ -160,7 +164,7 @@ func checkFilteredResults(pkgs []pkgserverv1.PackageManifest, filter []string) e
160
164
}
161
165
}
162
166
joinedMissingPackages := strings .Join (missingPackages , ", " )
163
- return fmt .Errorf ("Could not find the following requested package filters:\n %#v" , joinedMissingPackages )
167
+ return fmt .Errorf ("could not find the following requested package filters:\n %#v" , joinedMissingPackages )
164
168
}
165
169
return nil
166
170
}
0 commit comments