Skip to content

Bug 1931505: [On-prem] - fix vip filtering syntax for Keepalived remove-vips#2548

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
yboaron:f_keepalived_remove_vip
May 1, 2021
Merged

Bug 1931505: [On-prem] - fix vip filtering syntax for Keepalived remove-vips#2548
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
yboaron:f_keepalived_remove_vip

Conversation

@yboaron
Copy link
Contributor

@yboaron yboaron commented Apr 27, 2021 •
edited
Loading

https://bugzilla.redhat.com/show_bug.cgi?id=1931505 reproduced in QE folks environments even with the latest version,
seems that changing vip filtering syntax solved the problem locally.

@yboaron
Copy link
Contributor Author

yboaron commented Apr 27, 2021

/retitle Bug 1931505: [On-prem] - fix grep syntax for Keepalived remove-vips

@openshift-ci-robot openshift-ci-robot changed the title [On-prem] - fix grep syntax for Keepalived remove-vips Bug 1931505: [On-prem] - fix grep syntax for Keepalived remove-vips Apr 27, 2021
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Apr 27, 2021
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 27, 2021

@yboaron: This pull request references Bugzilla bug 1931505, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (eweiss@redhat.com), skipping review request.

Details

In response to this:

Bug 1931505: [On-prem] - fix grep syntax for Keepalived remove-vips

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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 27, 2021
@stbenjam
Copy link
Member

stbenjam commented Apr 27, 2021

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot removed the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Apr 27, 2021
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 27, 2021

@stbenjam: This pull request references Bugzilla bug 1931505, which is valid.

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

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (eweiss@redhat.com), skipping review request.

Details

In response to this:

/bugzilla 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 added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Apr 27, 2021
mandre
mandre reviewed Apr 27, 2021
View reviewed changes
templates/common/on-prem/files/keepalived.yaml Outdated
Comment on lines 103 to 104
Copy link
Member

@mandre mandre Apr 27, 2021

Choose a reason for hiding this comment

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

Nit: I'd personally remove the grep in the middle and rely on awk for filtering:

Suggested change
interface=$(ip -o a | grep "\s${address}/" | awk '{print $2}')
cidr=$(ip -o a | grep "\s${address}/" | awk '{print $4}')
interface=$(ip -o a | awk "/\s${address}/ {print \$2}")
cidr=$(ip -o a | awk "/\s${address}/ {print \$4}")

@yboaron yboaron force-pushed the f_keepalived_remove_vip branch from 2ef70f0 to a2e4468 Compare April 27, 2021 13:20
@yboaron yboaron changed the title Bug 1931505: [On-prem] - fix grep syntax for Keepalived remove-vips Bug 1931505: [On-prem] - fix vip filtering syntax for Keepalived remove-vips Apr 27, 2021
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 27, 2021

@yboaron: This pull request references Bugzilla bug 1931505, which is valid.

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

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (eweiss@redhat.com), skipping review request.

Details

In response to this:

Bug 1931505: [On-prem] - fix vip filtering syntax for Keepalived remove-vips

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.

cybertron
cybertron suggested changes Apr 27, 2021
View reviewed changes
Copy link
Member

@cybertron cybertron left a comment

Choose a reason for hiding this comment

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

Argh, I must have added the wrong quotes when I was fixing the vsphere job. :-(

One thing that needs to be fixed inline, but otherwise lgtm.

templates/common/on-prem/files/keepalived.yaml Outdated
Copy link
Member

@cybertron cybertron Apr 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This doesn't do quite the same thing. The awk needs to be:

awk "/\s${address}\// {print \$2}"

We need to make sure we match exactly the VIP and not a substring.

@yboaron yboaron force-pushed the f_keepalived_remove_vip branch from a2e4468 to d250a00 Compare April 27, 2021 15:33
@cybertron
Copy link
Member

cybertron commented Apr 27, 2021

/lgtm
/test e2e-openstack
/test e2e-ovirt
/test e2e-vsphere
/cc @Gal-Zaidman @jcpowermac @patrickdillon

cybertron
cybertron approved these changes Apr 27, 2021
View reviewed changes
Copy link
Member

@cybertron cybertron left a comment

Choose a reason for hiding this comment

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

/lgtm

Let's see if the bot likes me better now...

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 27, 2021
@cybertron
Copy link
Member

cybertron commented Apr 27, 2021

Progress! Let's see if it will run the jobs too. :-)

/test e2e-openstack
/test e2e-ovirt
/test e2e-vsphere
/cc @Gal-Zaidman @jcpowermac @patrickdillon

@cybertron
Copy link
Member

cybertron commented Apr 27, 2021

/retest

That's...a lotta red. Two of the on-prem platforms passed though so this is likely fine. I see in the metal-ipi job that it did the right thing as well:

2021-04-27T16:27:07.587096146Z + remove_vip fd2e:6f44:5dd8:c956::4
2021-04-27T16:27:07.587125393Z + address=fd2e:6f44:5dd8:c956::4
2021-04-27T16:27:07.588005687Z ++ ip -o a
2021-04-27T16:27:07.588067999Z ++ awk '/\sfd2e:6f44:5dd8:c956::4\// {print $2}'
2021-04-27T16:27:07.590997589Z + interface=br-ex
2021-04-27T16:27:07.591792615Z ++ ip -o a
2021-04-27T16:27:07.592046919Z ++ awk '/\sfd2e:6f44:5dd8:c956::4\// {print $4}'
2021-04-27T16:27:07.595184196Z + cidr=fd2e:6f44:5dd8:c956::4/128
2021-04-27T16:27:07.595184196Z + '[' -n br-ex ']'
2021-04-27T16:27:07.595212406Z + ip a del fd2e:6f44:5dd8:c956::4/128 dev br-ex

@Gal-Zaidman
Copy link

Gal-Zaidman commented Apr 28, 2021

/lgtm

@yboaron
Copy link
Contributor Author

yboaron commented Apr 28, 2021

I sent a test PR (use grep with " for VIP filtering) to check CI gates with grep instead of awk ..

[1] #2550

@yboaron
Copy link
Contributor Author

yboaron commented Apr 28, 2021

/retest

@mandre
Copy link
Member

mandre commented Apr 28, 2021

Seems to be working for ovirt and openstack at least.
/retest
/lgtm

@kikisdeliveryservice kikisdeliveryservice self-assigned this Apr 28, 2021
@yboaron
Copy link
Contributor Author

yboaron commented Apr 29, 2021

/retest

1 similar comment
@yboaron
Copy link
Contributor Author

yboaron commented Apr 29, 2021

/retest

@stbenjam
Copy link
Member

stbenjam commented Apr 30, 2021

/test e2e-metal-ipi

@cybertron
Copy link
Member

cybertron commented Apr 30, 2021

/test e2e-vsphere

@trozet trozet mentioned this pull request Apr 30, 2021
Merged
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2021
@jcpowermac
Copy link
Contributor

jcpowermac commented Apr 30, 2021

vsphere passed
/lgtm

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 30, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cybertron, Gal-Zaidman, jcpowermac, kikisdeliveryservice, mandre, yboaron

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [kikisdeliveryservice]

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

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 30, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 30, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 30, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 30, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 30, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 30, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

openshift-bot commented May 1, 2021

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit a391f97 into openshift:master May 1, 2021
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented May 1, 2021

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

Bugzilla bug 1931505 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1931505: [On-prem] - fix vip filtering syntax for Keepalived remove-vips

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.

@cybertron cybertron mentioned this pull request May 4, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@celebdor celebdor Awaiting requested review from celebdor

@Gal-Zaidman Gal-Zaidman Awaiting requested review from Gal-Zaidman

@jcpowermac jcpowermac Awaiting requested review from jcpowermac

@patrickdillon patrickdillon Awaiting requested review from patrickdillon

3 more reviewers

@mandre mandre mandre left review comments

@cybertron cybertron cybertron approved these changes

@kikisdeliveryservice kikisdeliveryservice kikisdeliveryservice approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mandre mandre

@cybertron cybertron

@jcpowermac jcpowermac

@kikisdeliveryservice kikisdeliveryservice

@Gal-Zaidman Gal-Zaidman

Labels

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

10 participants

@yboaron @openshift-ci-robot @stbenjam @cybertron @Gal-Zaidman @mandre @jcpowermac @openshift-bot @kikisdeliveryservice @openshift-merge-robot