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.

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

OCPEDGE-1126: Rebase LVMS in replacement of topolvm #3535

Conversation

jakobmoellerdev
Copy link
Contributor

@jakobmoellerdev jakobmoellerdev commented Jun 24, 2024

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies replaced with a generic unstructured client
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch resolved by using dynamic client with discovery API for LVMCluster
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally added opinionated webhook generation with notes for further maintenance
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle) rebased on 4.17 candidate replicated to quay as aligned. Binaries / shas are equivalent and once release is happening we just need to retrigger the rebase script with the registry.redhat.io url before pushing out the candidate for Microshift. Since the images are the same this is however not endangering breaking anything.
  • Add dynamic lvmd.yaml resolution via symlink into /var/lib/microshift/lvms/lvmd.yaml
  • Rebase on main (seems I have to do this a lot)

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 24, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 24, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 24, 2024
Copy link
Contributor

openshift-ci bot commented Jun 24, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 24, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 24, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 24, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)
  • Rebase on main

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 9b785e8 to 67b375d Compare June 26, 2024 09:59
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 27, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies replaced with a generic unstructured client
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)
  • Rebase on main

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 97621db to 23c7542 Compare June 27, 2024 15:14
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 27, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 27, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies replaced with a generic unstructured client
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)
  • Rebase on main

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 23c7542 to 11e4094 Compare June 27, 2024 15:33
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 1, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 1, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies replaced with a generic unstructured client
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)
  • Add dynamic lvmd.yaml resolution via symlink into /var/lib/microshift/lvms/lvmd.yaml
  • Rebase on main

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 2b9cc95 to a66137a Compare July 1, 2024 14:38
@copejon
Copy link
Contributor

copejon commented Jul 1, 2024

/cc @copejon

@openshift-ci openshift-ci bot requested a review from copejon July 1, 2024 22:24
@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 0bb8db8 to b911ad7 Compare July 4, 2024 09:57
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 4, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 4, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies replaced with a generic unstructured client
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)
  • Add dynamic lvmd.yaml resolution via symlink into /var/lib/microshift/lvms/lvmd.yaml
  • Rebase on main

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev
Copy link
Contributor Author

Putting up as ready for review now even though cleanup discussion is still pending

@jakobmoellerdev jakobmoellerdev marked this pull request as ready for review July 4, 2024 09:58
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 4, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 4, 2024

@jakobmoellerdev: This pull request references OCPEDGE-1126 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.17.0" version, but no target version was set.

In response to this:

TODO:

  • Generate Lister / Typed Clients due to otherwise mandatory import on lvm-operator introducing tons of dependencies replaced with a generic unstructured client
  • Resolve vendor conflict (see above) with normal resolution instead of vendor patch
  • Create Cleanup Scenario that deletes old set of resources from installations that were present in 4.15/4.16
  • Add upgrade test scenario to verify that LVMS works as expected
  • Add webhook yaml generation as part of the rebase script so that the validatingwebhook configuration is applied to LVMCluster normally
  • Use 4.17 Candidate instead of late 4.16 candidate once we have a CPaaS build out in the wild (need to trigger external replication that can be used during 4.17 testing cycle)
  • Add dynamic lvmd.yaml resolution via symlink into /var/lib/microshift/lvms/lvmd.yaml
  • Rebase on main

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 openshift-eng/jira-lifecycle-plugin repository.

@jakobmoellerdev
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 4, 2024
@openshift-ci openshift-ci bot requested a review from jogeo July 4, 2024 10:02
@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 3f5898a to def76aa Compare July 22, 2024 06:54
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2024
…t.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2024
Co-authored-by: Patryk Matuszak <pmtk@redhat.com>
runtimeCfg string,
) (*lvmd.Lvmd, error) {
usrCfgDir := filepath.Dir(usrCfg)
ctx, cancel := context.WithCancelCause(ctx)
Copy link
Member

@pmtk pmtk Jul 22, 2024

Choose a reason for hiding this comment

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

Just to be sure. AFAIK the context cancelation doesn't propagate back to parents, right?
So, if we get some error while watching, it won't be propagated back to main thread and MicroShift will continue running without hot reloading. Is that correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thats right, cancel will only cancel the context return from context.WithCancelCause, not the parent ctx. Ive tried this and tested around and microshift ctx keeps on running

pkg/components/storage.go Outdated Show resolved Hide resolved
@copejon
Copy link
Contributor

copejon commented Jul 22, 2024

A couple nits, but nothing to hold up the PR over

@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from 81a757e to cecd4fd Compare July 23, 2024 08:17
@jakobmoellerdev jakobmoellerdev force-pushed the rebase-lvms-registry-proxy.engineering.redhat.com-rh-osbs-lvms4-lvms-operator-bundle-v4.16.0-58 branch from cecd4fd to 6dcc336 Compare July 23, 2024 08:18
@copejon
Copy link
Contributor

copejon commented Jul 23, 2024

Looks great!

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2024
Copy link
Contributor

openshift-ci bot commented Jul 23, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: copejon, jakobmoellerdev

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 23, 2024
Copy link
Contributor

openshift-ci bot commented Jul 23, 2024

@jakobmoellerdev: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit 2abf2f6 into openshift:main Jul 23, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants