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

OCPBUGS-8523: Revert "daemon: Temporarily copy auth file with more open perms on FCOS" #3591

Merged
merged 1 commit into from
Mar 8, 2023
Merged

OCPBUGS-8523: Revert "daemon: Temporarily copy auth file with more open perms on FCOS" #3591

merged 1 commit into from
Mar 8, 2023

Conversation

vrutkovs
Copy link
Member

@vrutkovs vrutkovs commented Mar 7, 2023 •
edited
Loading

This reverts commit 6ccdd57.

- What I did
Reverted one of commits introduced in #3358 to fix OKD-63. This workaround however breaks Assisted Installer flow, which runs mcd start on Live ISO where /var/lib/kubelet/config.json is not yet created.

- How to verify it
Install OKD FCOS/SCOS

- Description for the changelog

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Mar 7, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-8523, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This reverts commit 0451275 and 6ccdd57.

- What I did
Reverted two commits introduced in #3358 to fix OKD-63. This fix however breaks Assisted Installer flow, which runs mcd start on Live ISO where /var/lib/kubelet/config.json is not yet created.

- How to verify it
Install OKD FCOS/SCOS

- Description for the changelog

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.

@openshift-ci openshift-ci bot requested a review from rioliu-rh March 7, 2023 19:16
@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 7, 2023

/test okd-e2e-aws
/test okd-scos-e2e-aws

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 7, 2023

/cc @cgwalters @yuqi-zhang

@openshift-ci openshift-ci bot requested review from cgwalters and yuqi-zhang March 7, 2023 19:18
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-8523, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

In response to this:

This reverts commit 0451275 and 6ccdd57.

- What I did
Reverted two commits introduced in #3358 to fix OKD-63. This workaround however breaks Assisted Installer flow, which runs mcd start on Live ISO where /var/lib/kubelet/config.json is not yet created.

- How to verify it
Install OKD FCOS/SCOS

- Description for the changelog

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.

@openshift-ci openshift-ci bot requested a review from cheesesashimi March 7, 2023 19:19
@cgwalters
Copy link
Member

Unfortunately I think 0451275 is currently load bearing also for RHCOS upgrades, so we likely can't revert it.

I did actually figure out how to do this without setenforce 0 in bootc though; note containers/bootc@9e1fbd1#diff-24bf3ccccd91ab1f7154fa3b5e2ee630d28a73beca318d12a49e8cca5fef94bdR25

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 7, 2023

Oh, okay, I can drop 0451275 revert

@vrutkovs vrutkovs force-pushed the remove-okd-63-workaround branch from 3433e7f to f5d9776 Compare March 7, 2023 19:36
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-8523, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

In response to this:

This reverts commit 6ccdd57.

- What I did
Reverted two commits introduced in #3358 to fix OKD-63. This workaround however breaks Assisted Installer flow, which runs mcd start on Live ISO where /var/lib/kubelet/config.json is not yet created.

- How to verify it
Install OKD FCOS/SCOS

- Description for the changelog

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.

@vrutkovs vrutkovs force-pushed the remove-okd-63-workaround branch from f5d9776 to cee9e69 Compare March 7, 2023 19:37
@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 7, 2023

/test okd-e2e-aws
/test okd-scos-e2e-aws

yuqi-zhang
yuqi-zhang approved these changes Mar 7, 2023
View reviewed changes
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

Seems like a clean revert. I guess if OKD CI passes, we are safe to merge?

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 7, 2023
@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 7, 2023

OKD install passed, failed on various flakes. Should be safe to merge imo

@cgwalters
Copy link
Member

One thing that'd be good to verify here is
/payload-job periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-gcp-ovn-rt-upgrade
Basically we want to verify we can still do an upgrade from stable with this.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 7, 2023

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/362cf6f0-bd3b-11ed-825b-95a1b37065a0-0

@cgwalters
Copy link
Member

/lgtm
/hold
for above test run, feel free to lift hold once it passes just to be sure.

(A bit more rationale here; originally FCOS+OKD hit this bug, but the relevant code did actually make its way into at least RHEL9 I believe if not RHEL8. I'm pretty sure the fix in coreos/rpm-ostree#4033 did make it in too, but still good to cross check)

@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 7, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 7, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, vrutkovs, yuqi-zhang

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,yuqi-zhang]

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

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 8, 2023

/test okd-e2e-aws
/test okd-scos-e2e-aws-ovn

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 8, 2023

/test okd-e2e-aws

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 8, 2023

Verified that this change unblocks assisted-installer workflow
/hold cancel

@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 Mar 8, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: This pull request references Jira Issue OCPBUGS-8523, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @rioliu-rh

In response to this:

This reverts commit 6ccdd57.

- What I did
Reverted one of commits introduced in #3358 to fix OKD-63. This workaround however breaks Assisted Installer flow, which runs mcd start on Live ISO where /var/lib/kubelet/config.json is not yet created.

- How to verify it
Install OKD FCOS/SCOS

- Description for the changelog

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.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b301773 and 2 for PR HEAD cee9e69 in total

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 8, 2023

/skip

@cgwalters
Copy link
Member

/override ci/prow/e2e-aws-ovn-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2023

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/e2e-aws-ovn-upgrade

In response to this:

/override ci/prow/e2e-aws-ovn-upgrade

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 8, 2023

@vrutkovs: 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/e2e-alibabacloud-ovn cee9e69 link false /test e2e-alibabacloud-ovn
ci/prow/okd-scos-e2e-gcp-ovn-upgrade cee9e69 link false /test okd-scos-e2e-gcp-ovn-upgrade
ci/prow/okd-scos-e2e-aws-ovn cee9e69 link false /test okd-scos-e2e-aws-ovn
ci/prow/okd-e2e-aws cee9e69 link false /test okd-e2e-aws

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.

@openshift-merge-robot openshift-merge-robot merged commit 6d7fbc6 into openshift:master Mar 8, 2023
@openshift-ci-robot
Copy link
Contributor

@vrutkovs: Jira Issue OCPBUGS-8523: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-8523 has been moved to the MODIFIED state.

In response to this:

This reverts commit 6ccdd57.

- What I did
Reverted one of commits introduced in #3358 to fix OKD-63. This workaround however breaks Assisted Installer flow, which runs mcd start on Live ISO where /var/lib/kubelet/config.json is not yet created.

- How to verify it
Install OKD FCOS/SCOS

- Description for the changelog

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.

@vrutkovs
Copy link
Member Author

vrutkovs commented Mar 8, 2023

/cherrypick release-4.13

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Mar 8, 2023
Merged
@openshift-cherrypick-robot
Copy link

@vrutkovs: new pull request created: #3594

In response to this:

/cherrypick release-4.13

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuqi-zhang yuqi-zhang yuqi-zhang approved these changes

@rioliu-rh rioliu-rh Awaiting requested review from rioliu-rh

@cgwalters cgwalters Awaiting requested review from cgwalters

@cheesesashimi cheesesashimi Awaiting requested review from cheesesashimi

Assignees

@cgwalters cgwalters

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vrutkovs @openshift-ci-robot @cgwalters @openshift-cherrypick-robot @yuqi-zhang @openshift-merge-robot