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

[release-4.16] OCPBUGS-46524: Ensure BMH deletion before InfrEnv and NS #2136

Merged
merged 1 commit into from
Jan 6, 2025
Merged

[release-4.16] OCPBUGS-46524: Ensure BMH deletion before InfrEnv and NS #2136

merged 1 commit into from
Jan 6, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #2131

/assign imiller0

@imiller0
ztp: Ensure BMH deletion before InfrEnv and NS
23309c5 
OCPBUGS-42945, during node or cluster cleanup the BMH must complete
deletion before the InfraEnv, NMStateConfig or Namespace are removed.
This means the BMH must be in a higher wave (later for creation, earlier
for deletion) than those other CRs.

The requirement comes from the cleanup phase of assisted
installer/baremetal operator. If the BMH automatedCleanupMode is not
disabled the node is rebooted into a new ISO image which cleans the
disk. The creation of this ISO requires the Namespace to be not in the
deleted state so that a new PreProvisioningImage CR can be created. The
ISO creation also requires that the correct NMStateConfig CR be present
(it is included in the ISO). The booting of the ISO requires the
InfraEnv CR to be present.

Signed-off-by: Ian Miller <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 17, 2024
Merged
@openshift-ci openshift-ci bot requested review from imiller0 and lack December 17, 2024 14:38
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: Jira Issue OCPBUGS-46071 has been cloned as Jira Issue OCPBUGS-46524. Will retitle bug to link to clone.
/retitle [release-4.16] OCPBUGS-46524: Ensure BMH deletion before InfrEnv and NS

In response to this:

This is an automated cherry-pick of #2131

/assign imiller0

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 changed the title [release-4.16] OCPBUGS-46071: Ensure BMH deletion before InfrEnv and NS [release-4.16] OCPBUGS-46524: Ensure BMH deletion before InfrEnv and NS Dec 17, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 17, 2024
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-46524, which is invalid:

  • expected dependent Jira Issue OCPBUGS-46071 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

In response to this:

This is an automated cherry-pick of #2131

/assign imiller0

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.

@imiller0
Copy link
Contributor

/cherry-pick release-4.15

@openshift-cherrypick-robot
Copy link
Author

@imiller0: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.15

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.

@imiller0
Copy link
Contributor

imiller0 commented Jan 6, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 6, 2025
@openshift-ci-robot
Copy link
Collaborator

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.z) matches configured target version for branch (4.16.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-46071 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-46071 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
  • bug has dependents

Requesting review from QA contact:
/cc @dgonyier

In response to this:

/jira refresh

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 requested a review from dgonyier January 6, 2025 16:56
imiller0
imiller0 approved these changes Jan 6, 2025
View reviewed changes
Copy link
Contributor

@imiller0 imiller0 left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 6, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: imiller0, openshift-cherrypick-robot

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 Jan 6, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 10c3276 into openshift-kni:release-4.16 Jan 6, 2025
6 checks passed
@openshift-ci-robot
Copy link
Collaborator

@openshift-cherrypick-robot: Jira Issue OCPBUGS-46524: All pull requests linked via external trackers have merged:

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

In response to this:

This is an automated cherry-pick of #2131

/assign imiller0

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-cherrypick-robot
Copy link
Author

@imiller0: #2136 failed to apply on top of branch "release-4.15":

Applying: ztp: Ensure BMH deletion before InfrEnv and NS
Using index info to reconstruct a base tree...
M	ztp/siteconfig-generator/siteConfig/clusterCRsV1.go
M	ztp/siteconfig-generator/siteConfig/clusterCRsV2.go
M	ztp/siteconfig-generator/siteConfig/siteConfigBuilder_test.go
A	ztp/siteconfig-generator/siteConfig/testdata/siteConfigStandardClusterTestOutputWithZap.yaml
M	ztp/siteconfig-generator/siteConfig/testdata/siteConfigTestOutput.yaml
M	ztp/siteconfig-generator/siteConfig/testdata/siteConfigV2TestOutput.yaml
Falling back to patching base and 3-way merge...
Auto-merging ztp/siteconfig-generator/siteConfig/testdata/siteConfigV2TestOutput.yaml
Auto-merging ztp/siteconfig-generator/siteConfig/testdata/siteConfigTestOutput.yaml
CONFLICT (modify/delete): ztp/siteconfig-generator/siteConfig/testdata/siteConfigStandardClusterTestOutputWithZap.yaml deleted in HEAD and modified in ztp: Ensure BMH deletion before InfrEnv and NS. Version ztp: Ensure BMH deletion before InfrEnv and NS of ztp/siteconfig-generator/siteConfig/testdata/siteConfigStandardClusterTestOutputWithZap.yaml left in tree.
Auto-merging ztp/siteconfig-generator/siteConfig/siteConfigBuilder_test.go
Auto-merging ztp/siteconfig-generator/siteConfig/clusterCRsV2.go
Auto-merging ztp/siteconfig-generator/siteConfig/clusterCRsV1.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 ztp: Ensure BMH deletion before InfrEnv and NS

In response to this:

/cherry-pick release-4.15

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.

@imiller0 imiller0 mentioned this pull request Jan 6, 2025
Merged
@imiller0
Copy link
Contributor

imiller0 commented Jan 6, 2025

Manually cherry-picked back to release-4.15 in #2146

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

@imiller0 imiller0 imiller0 approved these changes

@lack lack Awaiting requested review from lack

@dgonyier dgonyier Awaiting requested review from dgonyier

Assignees

@imiller0 imiller0

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important 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.
3 participants
@openshift-cherrypick-robot @openshift-ci-robot @imiller0