Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Propagate Labels from CatalogSource to PackageManifests #576

Merged
merged 1 commit into from
Nov 21, 2018
Merged

Propagate Labels from CatalogSource to PackageManifests #576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions pkg/package-server/provider/inmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func NewInMemoryProvider(informers []cache.SharedIndexInformer, queueOperator *q
}

// parsePackageManifestsFromConfigMap returns a list of PackageManifests from a given ConfigMap
func parsePackageManifestsFromConfigMap(cm *corev1.ConfigMap, catalogSourceName, catalogSourceNamespace, catalogSourcePublisher, catalogSourceDisplayName string) ([]packagev1alpha1.PackageManifest, error) {
func parsePackageManifestsFromConfigMap(cm *corev1.ConfigMap, catsrc *operatorsv1alpha1.CatalogSource) ([]packagev1alpha1.PackageManifest, error) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change the function signature to just accept the whole CatalogSource rather than individual fields.

cmName := cm.GetName()
logger := log.WithFields(log.Fields{
"Action": "Load ConfigMap",
Expand Down Expand Up @@ -140,10 +140,10 @@ func parsePackageManifestsFromConfigMap(cm *corev1.ConfigMap, catalogSourceName,
Status: status,
}

manifest.Status.CatalogSource = catalogSourceName
manifest.Status.CatalogSourceNamespace = catalogSourceNamespace
manifest.Status.CatalogSourceDisplayName = catalogSourceDisplayName
manifest.Status.CatalogSourcePublisher = catalogSourcePublisher
manifest.Status.CatalogSource = catsrc.GetName()
manifest.Status.CatalogSourceNamespace = catsrc.GetNamespace()
manifest.Status.CatalogSourceDisplayName = catsrc.Spec.DisplayName
manifest.Status.CatalogSourcePublisher = catsrc.Spec.Publisher

// add all PackageChannel CSVDescriptions
for i, channel := range manifest.Status.Channels {
Expand All @@ -170,6 +170,9 @@ func parsePackageManifestsFromConfigMap(cm *corev1.ConfigMap, catalogSourceName,
// set CatalogSource labels
manifest.ObjectMeta.Labels["catalog"] = manifest.Status.CatalogSource
manifest.ObjectMeta.Labels["catalog-namespace"] = manifest.Status.CatalogSourceNamespace
for k, v := range catsrc.GetLabels() {
manifest.ObjectMeta.Labels[k] = v
}

log.Debugf("retrieved packagemanifest %s", manifest.GetName())
manifests = append(manifests, manifest)
Expand Down Expand Up @@ -204,7 +207,7 @@ func (m *InMemoryProvider) syncCatalogSource(obj interface{}) error {
}

// parse PackageManifest from ConfigMap
manifests, err = parsePackageManifestsFromConfigMap(cm, catsrc.GetName(), catsrc.GetNamespace(), catsrc.Spec.Publisher, catsrc.Spec.DisplayName)
manifests, err = parsePackageManifestsFromConfigMap(cm, catsrc)
if err != nil {
return fmt.Errorf("failed to load package manifest from config map %s", cm.GetName())
}
Expand Down