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

MCO MCO-424: daemon: Remove old legacy OS update path #3583

Merged

Conversation

cgwalters
Copy link
Member

This must be dead code in 4.14. There's no going back. Everything in 4.12 really should have transitioned, and certainly 4.13 and very much most definitely 4.14.

Deleting code is good on general principle, but very specifically this cost me hours of debugging because I modified the legacy update path when trying something, not the new one.

@openshift-ci openshift-ci bot requested review from cheesesashimi and jkyros March 4, 2023 13:36
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2023
@cgwalters cgwalters force-pushed the no-legacy-osupdate branch from 11b173e to c9d8953 Compare March 4, 2023 14:13
@jkyros
Copy link
Contributor

jkyros commented Mar 6, 2023

Yes,I would love to get rid of this. Holding for pre-merge QE.
/hold
/cc @rioliu-rh

@openshift-ci openshift-ci bot requested a review from rioliu-rh March 6, 2023 17:30
@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 Mar 6, 2023
@jkyros
Copy link
Contributor

jkyros commented Mar 6, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 6, 2023
@sinnykumari
Copy link
Contributor

I agree that we will most likely won't be using this code path. Although, this is a removal of old approach, so seems like ideal candidate for getting qe approval label as per pre-merge testing.

When we are ready with dropping machine-os-content, we can get #3364 and this PR together as part of https://issues.redhat.com/browse/MCO-424.

@cgwalters cgwalters force-pushed the no-legacy-osupdate branch from c9d8953 to ed75611 Compare June 1, 2023 20:09
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 1, 2023
@cgwalters
Copy link
Member Author

Rebased 🏄

Although, this is a removal of old approach, so seems like ideal candidate for getting qe approval label as per pre-merge testing.

Sure, that's fine. That said, I think a payload job upgrading from 4.13 combined with the presubmits should give pretty good coverage here.

/payload-job periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-upgrade

I'm however less certain I'd say we should combine this PR and dropping machine-os-content. All of this is just dead code today.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@cgwalters: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f77e5c20-00b8-11ee-9f26-79e16bfc5388-0

@cgwalters cgwalters force-pushed the no-legacy-osupdate branch from ed75611 to 5731660 Compare June 2, 2023 12:35
@cgwalters cgwalters force-pushed the no-legacy-osupdate branch from 5731660 to 628040c Compare June 20, 2023 19:30
@cgwalters
Copy link
Member Author

/payload-job periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 20, 2023

@cgwalters: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-gcp-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ea117260-0fa0-11ee-886c-2ae9a5b07692-0

@cgwalters cgwalters force-pushed the no-legacy-osupdate branch from 628040c to 37682d3 Compare June 27, 2023 20:38
@sinnykumari sinnykumari changed the title daemon: Remove old legacy OS update path MCO MCO-424: daemon: Remove old legacy OS update path Jun 30, 2023
@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 30, 2023
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jun 30, 2023

@cgwalters: This pull request references MCO-424 which is a valid jira issue.

In response to this:

This must be dead code in 4.14. There's no going back. Everything in 4.12 really should have transitioned, and certainly 4.13 and very much most definitely 4.14.

Deleting code is good on general principle, but very specifically this cost me hours of debugging because I modified the legacy update path when trying something, not the new one.

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.

@sinnykumari
Copy link
Contributor

LGTM, thanks for working on this!
/lgtm

/assign @sergiordlr for pre-merge testing

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 30, 2023
@sergiordlr
Copy link

sergiordlr commented Jun 30, 2023

Verification using IPI on AWS

  1. We have installed a cluster providing 2 MCs (master and worker) with custom osImage in the "openshift" directory before executing the installation. Following the instructions in test case OCP-54130 - [MCO][Layering] Create an OCP cluster using a provided custom osImage

The installation finished OK.
The master and worker nodes were booted using the provided custom osImage directly.
Once the installation was done, removing the MCs that we provided before the installation made the nodes to run the default os image.

  1. We have installed a cluster using the normal procedure (without providing MCs with osImage).

The installation was OK.

  1. We executed some sanity check test cases in the cluster deployed in step 2.

The negative test cases (those using a non-bootable image and a non-existing image) fail because the error messages have changed. Messages are OK, they are descriptive enough, but we need to adapt the test cases to use the new messages.

  1. We are executing some automated e2e test cases on the cluster deployed in step2. The tests are already running, it will take several hours.

No problem has been found up to now. We will wait until the automated cases are finished, if all the test cases pass we will add the qe-approved label. I'm sorry, but the tests take a big amount of time to be executed, so probably we will have to add the label on Monday.

@sergiordlr
Copy link

Verification using IPI on AWS.

Apart from the steps described in the previous comment. We executed:

  1. Upgrade with custom MCP
  • Install a 4.13 cluster
  • create a "infra" MCP and add one node to the "infra" MCP
  • configure a custom osImage in the "infra" MCP
  • upgrade the cluster to this PR's version
  • all nodes were correctly upgraded to the new osImage, but the "infra" node that is using its custom osImage
  • remove the custom osImage from the "infra" pool
  • "infra" pool starts using the new upgraded osImage and the upgrade is completed without problems

No problems found.

  1. Execute automated casses:

42365-add real time kernel argument
42368-add max pods to the kubelet config
42369-add container runtime config
56131-Install all extensions
46999-Config Drift. Config file permissions.
54052-Not bootable layered osImage provided
54085-Update osImage changing /etc /usr and rpm
54054-Not pullable layered osImage provided
54049-Verify base images in the release image
54159-Apply a new osImage on a cluster with already installed rpms
54909-Configure extensions while using a custom osImage
54915-Configure kerneltype while using a custom osImage
55002-Get OSImageURL override related metric data available in telemetry
63894-Scaleup using 4.1 cloud image
52822-Create new config resources with 2.2.0 ignition boot image nodes

No problems found. (Negative cases need to be adapted, though).

We can add the qe-approved label

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jul 3, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 6d8204f and 2 for PR HEAD 37682d37513a327ad07663c608e0d4119bf7fd06 in total

@sinnykumari
Copy link
Contributor

/test e2e-gcp-op
/test e2e-hypershift

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 85fe0da and 1 for PR HEAD 37682d37513a327ad07663c608e0d4119bf7fd06 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 5ddeae5 and 0 for PR HEAD 37682d37513a327ad07663c608e0d4119bf7fd06 in total

@sinnykumari
Copy link
Contributor

Ah recent merge lead to merge conflict for this PR. Needs rebasing.

@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 4, 2023
This must be dead code in 4.14.  There's no going back.  Everything
in 4.12 really should have transitioned, and certainly 4.13 and
very much most definitely 4.14.

Deleting code is good on general principle, but very specifically
this cost me hours of debugging because I modified the legacy update
path when trying something, not the new one.
@cgwalters cgwalters force-pushed the no-legacy-osupdate branch from 37682d3 to 85b297c Compare July 10, 2023 13:54
@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 10, 2023
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2023
@cgwalters
Copy link
Member Author

OK yep, this PR to remove completely dead code is now on at least its 3rd rebase due to conflicts - i.e. people were spending time changing completely unused code.

@jkyros
Copy link
Contributor

jkyros commented Jul 11, 2023

hopefully the general CI issues will resolve and we can get this in without a 4th rebase 🙂
/lgtm

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

openshift-ci bot commented Jul 11, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jkyros, sinnykumari

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:
  • OWNERS [cgwalters,jkyros,sinnykumari]

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
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 2069e55 and 2 for PR HEAD 85b297c in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD d0c0670 and 1 for PR HEAD 85b297c in total

@djoshy
Copy link
Contributor

djoshy commented Jul 14, 2023

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 1d0fe71 and 0 for PR HEAD 85b297c in total

@openshift-ci-robot
Copy link
Contributor

/hold

Revision 85b297c was retested 3 times: holding

@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 18, 2023
@djoshy
Copy link
Contributor

djoshy commented Jul 19, 2023

/retest-required

2 similar comments
@djoshy
Copy link
Contributor

djoshy commented Jul 19, 2023

/retest-required

@djoshy
Copy link
Contributor

djoshy commented Jul 20, 2023

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 20, 2023

@cgwalters: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-gcp-ovn-upgrade 5731660a644c7dfc5dc193bb3681aec652bc0d95 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/e2e-alibabacloud-ovn 5731660a644c7dfc5dc193bb3681aec652bc0d95 link false /test e2e-alibabacloud-ovn
ci/prow/okd-scos-e2e-aws-ovn 85b297c link false /test okd-scos-e2e-aws-ovn

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

@djoshy
Copy link
Contributor

djoshy commented Jul 20, 2023

Looks like a flake

/test e2e-aws-ovn

@djoshy
Copy link
Contributor

djoshy commented Jul 20, 2023

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 20, 2023
@openshift-merge-robot openshift-merge-robot merged commit e91b573 into openshift:master Jul 20, 2023
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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants