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.14] OCPBUGS-19040: Restore routes on AWS Windows 2022 nodes #1796

Merged
merged 3 commits into from
Sep 15, 2023
Merged

[release-4.14] OCPBUGS-19040: Restore routes on AWS Windows 2022 nodes #1796

merged 3 commits into from
Sep 15, 2023

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #1772

/assign aravindhp

@aravindhp
Introduce waitStopped()
204d43f 
Introduce a helper method that waits for a service to stop running.
@aravindhp
Expand createService()
a7c3182 
Setting of the service description and recovery actions were being done
in ensureServiceIsRunning(). This logically belongs with creating a
service and should only be done if a service is not present. This also
allows calling ensureServiceIsRunning() for existing services without
the existing service being modified.
@aravindhp
Restore routes on AWS Windows 2022 nodes
0906781 
Run the EC2Launch v2 service as a hack to restore routes after the HNS
networks have been deleted during deconfiguration. This allows the same
VM to be configured as a node again.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 15, 2023
Merged
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-15988 has been cloned as Jira Issue OCPBUGS-19040. Will retitle bug to link to clone.
/retitle [release-4.14] OCPBUGS-19040: Restore routes on AWS Windows 2022 nodes

In response to this:

This is an automated cherry-pick of #1772

/assign aravindhp

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 changed the title [release-4.14] OCPBUGS-15988: Restore routes on AWS Windows 2022 nodes [release-4.14] OCPBUGS-19040: Restore routes on AWS Windows 2022 nodes Sep 15, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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. labels Sep 15, 2023
@openshift-ci-robot
Copy link

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

6 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)
  • dependent bug Jira Issue OCPBUGS-15988 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-15988 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
  • bug has dependents

Requesting review from QA contact:
/cc @rrasouli

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 #1772

/assign aravindhp

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.

@jrvaldes
Copy link
Contributor

/lgtm

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

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 15, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aravindhp, 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 Sep 15, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 15, 2023

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

@openshift-merge-robot openshift-merge-robot merged commit d07b6b8 into openshift:release-4.14 Sep 15, 2023
15 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

This is an automated cherry-pick of #1772

/assign aravindhp

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.

@aravindhp
Copy link
Contributor

/cherry-pick release-4.13

@openshift-cherrypick-robot
Copy link
Author

@aravindhp: #1796 failed to apply on top of branch "release-4.13":

Applying: Introduce waitStopped()
Applying: Expand createService()
Applying: Restore routes on AWS Windows 2022 nodes
Using index info to reconstruct a base tree...
M	pkg/nodeconfig/nodeconfig.go
M	pkg/windows/windows.go
M	test/e2e/delete_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/delete_test.go
CONFLICT (content): Merge conflict in test/e2e/delete_test.go
Auto-merging pkg/windows/windows.go
Auto-merging pkg/nodeconfig/nodeconfig.go
CONFLICT (content): Merge conflict in pkg/nodeconfig/nodeconfig.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Restore routes on AWS Windows 2022 nodes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick 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.

@aravindhp aravindhp mentioned this pull request Sep 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aravindhp aravindhp aravindhp approved these changes

@rrasouli rrasouli Awaiting requested review from rrasouli

@mansikulkarni96 mansikulkarni96 Awaiting requested review from mansikulkarni96

@sebsoto sebsoto Awaiting requested review from sebsoto

Assignees

@aravindhp aravindhp

@jrvaldes jrvaldes

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-critical Referenced Jira bug's severity is critical 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.

None yet
5 participants
@openshift-cherrypick-robot @openshift-ci-robot @jrvaldes @aravindhp @openshift-merge-robot