Merge pull request #766 from jianzhangbjz/fix-provider

openshift-merge-robot · web-flow · commit 8ee9de6cc272 · 2019-05-01T22:04:12.000+02:00
fix the labels.provider of packagemanifest issue
diff --git a/pkg/package-server/provider/registry.go b/pkg/package-server/provider/registry.go
@@ -327,7 +327,7 @@ func toPackageManifest(pkg *api.Package, client registryClient) (*operators.Pack
 			CurrentCSVDesc: operators.CreateCSVDescription(&csv),
 		}
 
-		if manifest.Status.DefaultChannel != "" && csv.GetName() == manifest.Status.DefaultChannel || i == 0 {
+		if manifest.Status.DefaultChannel != "" && pkgChannel.GetName() == manifest.Status.DefaultChannel || i == 0 {
 			manifest.Status.Provider = operators.AppLink{
 				Name: csv.Spec.Provider.Name,
 				URL:  csv.Spec.Provider.URL,

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ func toPackageManifest(pkg api.Package, client registryClient) (operators.Pack`
`327`	`327`	`CurrentCSVDesc: operators.CreateCSVDescription(&csv),`
`328`	`328`	`}`
`329`	`329`
`330`		`- if manifest.Status.DefaultChannel != "" && csv.GetName() == manifest.Status.DefaultChannel \|\| i == 0 {`
	`330`	`+ if manifest.Status.DefaultChannel != "" && pkgChannel.GetName() == manifest.Status.DefaultChannel \|\| i == 0 {`
`331`	`331`	`manifest.Status.Provider = operators.AppLink{`
`332`	`332`	`Name: csv.Spec.Provider.Name,`
`333`	`333`	`URL: csv.Spec.Provider.URL,`