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.11] OCPBUGS-3932: Add assigned egress ips into capacity #78

Merged
merged 2 commits into from Dec 21, 2022
Merged

[release-4.11] OCPBUGS-3932: Add assigned egress ips into capacity #78

merged 2 commits into from Dec 21, 2022

Conversation

pperiyasamy
Copy link
Member

@pperiyasamy pperiyasamy commented Nov 29, 2022 •
edited

This is manual cherry-pick of #73.

Resolved conflicts:
94a5b01: go.mod, go.sum and vendor directory
1eaff10: pkg/controller/node/node_controller.go, pkg/cloudprovider/aws.go, pkg/cloudprovider/openstack.go and pkg/cloudprovider/openstack_test.go

/assign @andreaskaris @kyrtapz

@openshift-ci-robot openshift-ci-robot added the jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. label Nov 29, 2022
@openshift-ci-robot
Copy link

@pperiyasamy: This pull request references Jira Issue OCPBUGS-3932, which is invalid:

  • expected the bug to target the "4.11.z" version, but it targets "4.11.0" instead
  • expected Jira Issue OCPBUGS-3932 to depend on a bug targeting a version in 4.12.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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 manual cherry-pick of #73.

/assign @andreaskaris @kyrtapz

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 openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 29, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2022

@pperiyasamy: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.11] OCPBUGS-3932: Add assigned egress ips into capacity

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.

@pperiyasamy
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@pperiyasamy: This pull request references Jira Issue OCPBUGS-3932, which is invalid:

  • expected Jira Issue OCPBUGS-3932 to depend on a bug targeting a version in 4.12.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

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.

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 kubernetes/test-infra repository.

@pperiyasamy
Copy link
Member Author

/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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Nov 29, 2022
@openshift-ci-robot
Copy link

@pperiyasamy: This pull request references Jira Issue OCPBUGS-3932, 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.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-3552 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-3552 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @huiran0826

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 kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 29, 2022
@kyrtapz
Copy link
Contributor

kyrtapz commented Nov 29, 2022

Please use git cherry-pick -x for both commits.
Was there any conflicts? Is there a reason you didn't use the cherry-pick bot?

@pperiyasamy
Copy link
Member Author

Please use git cherry-pick -x for both commits.
Was there any conflicts? Is there a reason you didn't use the cherry-pick bot?

Yes @kyrtapz, git cherry-pick created too many conflicts for this commit because of version changes, hence this commit is done without cherry-pick. is that fine ?

@openshift-ci-robot
Copy link

@pperiyasamy: This pull request references Jira Issue OCPBUGS-3932, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.11.z) matches configured target version for branch (4.11.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-3552 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Jira Issue OCPBUGS-3552 targets the "4.12.0" version, which is one of the valid target versions: 4.12.0
  • bug has dependents

Requesting review from QA contact:
/cc @huiran0826

In response to this:

This is manual cherry-pick of #73.

Resolved conflicts:
94a5b01: go.mod, go.sum and vendor directory
1eaff10: pkg/controller/node/node_controller.go, pkg/cloudprovider/aws.go, pkg/cloudprovider/openstack.go and pkg/cloudprovider/openstack_test.go

/assign @andreaskaris @kyrtapz

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 Nov 29, 2022

@pperiyasamy: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

[release-4.11] OCPBUGS-3932: Add assigned egress ips into capacity

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.

@pperiyasamy
Copy link
Member Author

Please use git cherry-pick -x for both commits.
Was there any conflicts? Is there a reason you didn't use the cherry-pick bot?

Yes @kyrtapz, git cherry-pick created too many conflicts for this commit because of version changes, hence this commit is done without cherry-pick. is that fine ?

@kyrtapz as discussed offline, git cherry-pick -x is used for both commits now.

@andreaskaris
Copy link
Contributor

andreaskaris commented Dec 7, 2022 •
edited

/lgtm I compared 6a22336 against 8ffb0c1 and other than the missing OSP stuff, it looks exactly the same as the original
nit: I would have added that to the Conflicts: section in the PR directly but no biggy

Were there conflicts in 24d6ba6 ? If so, please mark them inside the commit message as well:

Conflicts:
     <file path and name>

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 9, 2022
@pperiyasamy
Update go.mod, go.sum and vendor for gomega, ginko
be8d44c 
Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 98ba906)
(cherry picked from commit 568aca8)
@pperiyasamy
Add assigned egress ips into capacity
b7e0f63 
This makes sure capacity field in cloud.network.openshift.io/egress-ipconfig
node annotation (which is introduced in 4.10) denotes correct value when
cluster upgrade happens for example 4.9 to 4.10 and node is already
assigned with egress ips.

Signed-off-by: Periyasamy Palanisamy <pepalani@redhat.com>
(cherry picked from commit 8ffb0c1)
(cherry picked from commit bfe1601)
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2022
@kyrtapz
Copy link
Contributor

kyrtapz commented Dec 12, 2022

/retest

@kyrtapz
Copy link
Contributor

kyrtapz commented Dec 14, 2022

/retest

1 similar comment
@andreaskaris
Copy link
Contributor

/retest

@kyrtapz
Copy link
Contributor

kyrtapz commented Dec 15, 2022

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 15, 2022
@kyrtapz
Copy link
Contributor

kyrtapz commented Dec 15, 2022

/retest

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

openshift-ci bot commented Dec 15, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andreaskaris, kyrtapz, pperiyasamy

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 Dec 15, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 15, 2022

@pperiyasamy: 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.

@jechen0648
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 21, 2022
@openshift-merge-robot openshift-merge-robot merged commit 7cae6d8 into openshift:release-4.11 Dec 21, 2022
@openshift-ci-robot
Copy link

@pperiyasamy: All pull requests linked via external trackers have merged:

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

In response to this:

This is manual cherry-pick of #73.

Resolved conflicts:
94a5b01: go.mod, go.sum and vendor directory
1eaff10: pkg/controller/node/node_controller.go, pkg/cloudprovider/aws.go, pkg/cloudprovider/openstack.go and pkg/cloudprovider/openstack_test.go

/assign @andreaskaris @kyrtapz

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.

@pperiyasamy pperiyasamy deleted the incorrect-egressip-capacity branch December 21, 2022 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danwinship danwinship Awaiting requested review from danwinship

@jluhrsen jluhrsen Awaiting requested review from jluhrsen

@huiran0826 huiran0826 Awaiting requested review from huiran0826

Assignees

@mffiedler mffiedler

@rbbratta rbbratta

@andreaskaris andreaskaris

@weliang1 weliang1

@kyrtapz kyrtapz

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@asood-rh asood-rh

@jechen0648 jechen0648

@qiowang721 qiowang721

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. 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