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

Jump to bottom

feat(package-server): create subscription manifest #609

Merged
merged 4 commits into from
Dec 10, 2018
Merged

feat(package-server): create subscription manifest #609

merged 4 commits into from
Dec 10, 2018

Conversation

njhale
Copy link
Member

@njhale njhale commented Dec 7, 2018

Description

  • Adds helm template for package-service Subscription manifest
  • Adds helm template for olm-operators CatalogSource/ConfigMap
  • Generates manifests for package-service Subscription
  • Generates manifests for olm-operators CatalogSource/ConfigMap
  • Adds Subscription requeuing on CatalogSource update

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 7, 2018
@njhale njhale force-pushed the package-server-subscription branch from d1b73c0 to 3257c66 Compare December 7, 2018 15:51
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 7, 2018
@njhale
Copy link
Member Author

njhale commented Dec 7, 2018

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2018
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: njhale

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ecordell
ecordell reviewed Dec 7, 2018
View reviewed changes
deploy/chart/templates/0000_30_14-olm-operators.configmap.yaml Outdated
{{- end }}
{{- end }}
packages: |-
{{ include "packageserver.package" . | nindent 4 }}
Copy link
Member

Choose a reason for hiding this comment

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

if you change these to {{- you won't have all the extra spaces in the output

pkg/controller/operators/catalog/operator.go
@@ -195,6 +203,21 @@ func (o *Operator) syncCatalogSources(obj interface{}) (syncError error) {
o.sources[sourceKey] = src
o.sourcesLastUpdate = timeNow()

// Sync any dependent Subscriptions
subs, err := o.lister.OperatorsV1alpha1().SubscriptionLister().List(labels.Everything())
Copy link
Member

Choose a reason for hiding this comment

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

This error isn't being checked

@njhale njhale force-pushed the package-server-subscription branch 2 times, most recently from 019ad87 to c2f6957 Compare December 8, 2018 00:22
@ecordell
Copy link
Member

ecordell commented Dec 8, 2018

/lgtm
/retest

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 8, 2018
@ecordell ecordell mentioned this pull request Dec 8, 2018
Closed
@njhale njhale changed the title feat(package-server): create subscription manifest [WIP] feat(package-server): create subscription manifest Dec 8, 2018
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 8, 2018
@ecordell
Copy link
Member

ecordell commented Dec 8, 2018

@njhale It looks like running gofmt on the things we codegen is causing verify to fail?

@njhale
Copy link
Member Author

njhale commented Dec 9, 2018 •
edited
Loading

@njhale It looks like running gofmt on the things we codegen is causing verify to fail?

Yup, looks like it. I ran goimports on pkg/... earlier. I'll amend the last commit with the regenerated code soon.

Update: Noticed that make verify-codegen needs to be run in the GOPATH. This should work fine in our CI (using go 1.10), but we may want to add a make verify-container-codegen for local sanity checking.

@njhale njhale force-pushed the package-server-subscription branch from c2f6957 to 23ca06c Compare December 9, 2018 01:51
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2018
@njhale njhale force-pushed the package-server-subscription branch from 23ca06c to ab66501 Compare December 9, 2018 04:04
@njhale
Copy link
Member Author

njhale commented Dec 9, 2018

/test e2e-aws-olm

1 similar comment
@njhale
Copy link
Member Author

njhale commented Dec 9, 2018

/test e2e-aws-olm

@ecordell
Copy link
Member

ecordell commented Dec 9, 2018

/retest

2 similar comments
@ecordell
Copy link
Member

ecordell commented Dec 9, 2018

/retest

@ecordell
Copy link
Member

/retest

@njhale njhale force-pushed the package-server-subscription branch from db9f60c to 161e61c Compare December 10, 2018 14:14
@njhale njhale changed the title [WIP] feat(package-server): create subscription manifest feat(package-server): create subscription manifest Dec 10, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 10, 2018
@ecordell
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 10, 2018
@njhale njhale force-pushed the package-server-subscription branch from 161e61c to d519125 Compare December 10, 2018 18:43
@openshift-ci-robot
Copy link
Collaborator

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed lgtm Indicates that a PR is ready to be merged. labels Dec 10, 2018
@njhale njhale force-pushed the package-server-subscription branch from d519125 to 16faa06 Compare December 10, 2018 18:57
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 10, 2018
@ecordell
Copy link
Member

/retest

1 similar comment
@njhale
Copy link
Member Author

njhale commented Dec 10, 2018

/retest

@openshift-ci-robot
Copy link
Collaborator

@njhale: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws 3fb1c34 link /test e2e-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@njhale njhale merged commit 8cdb2cc into operator-framework:master Dec 10, 2018
ecordell pushed a commit to ecordell/operator-lifecycle-manager that referenced this pull request Mar 8, 2019
@njhale
Merge pull request operator-framework#609 from njhale/package-server-…
d164180 
…subscription

feat(package-server): create subscription manifest
@njhale njhale added the kind/feature Categorizes issue or PR as related to a new feature. label Mar 19, 2019
@njhale njhale deleted the package-server-subscription branch September 30, 2019 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ecordell ecordell ecordell left review comments

@alecmerdler alecmerdler Awaiting requested review from alecmerdler

@jpeeler jpeeler Awaiting requested review from jpeeler

Assignees

@ecordell ecordell

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/feature Categorizes issue or PR as related to a new feature. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@njhale @openshift-ci-robot @ecordell