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.

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

Bug 1989688: Add IPv6 support to egress-router-cni #52

Merged
merged 1 commit into from Aug 13, 2021

Conversation

msherif1234
Copy link
Contributor

@msherif1234 msherif1234 commented Aug 6, 2021

Signed-off-by: Mohamed Mahmoud mmahmoud@redhat.com

  • Added IPv6 suport to egress router CNI
  • Added check if the default route is already installed to not fail the CNI

verified the fix using cluster-bot

oc create -f https://raw.githubusercontent.com/weliang1/Openshift_Networking/master/Features/EgressRouter/ipv6-ovn-egressrouter-redirect-MultipleDestinations.yaml

oc get all
NAME                                               READY   STATUS    RESTARTS   AGE
pod/egress-router-cni-deployment-98c6f8bcb-wmhk6   1/1     Running   0          3m20s

NAME                 TYPE           CLUSTER-IP   EXTERNAL-IP                            PORT(S)   AGE
service/kubernetes   ClusterIP      172.30.0.1   <none>                                 443/TCP   45m
service/openshift    ExternalName   <none>       kubernetes.default.svc.cluster.local   <none>    35m

NAME                                           READY   UP-TO-DATE   AVAILABLE   AGE
deployment.apps/egress-router-cni-deployment   1/1     1            1           3m20s

NAME                                                     DESIRED   CURRENT   READY   AGE
replicaset.apps/egress-router-cni-deployment-98c6f8bcb   1         1         1       3m20s

sh-4.4# cat /tmp/egress-router-log 
2021-08-07T01:19:35Z [debug] Called CNI ADD
2021-08-07T01:19:35Z [debug] Gateway: fe80::5054:ff:fe21:4d31
2021-08-07T01:19:35Z [debug] IP Source Addresses: [fd2e:6f44:5dd8::64/64]
2021-08-07T01:19:35Z [debug] IP Destinations: [80 TCP 2607:f8b0:4004:808::200e 8080 TCP 2600:1408:20:c81::3831 80 8888 TCP 2001:420:1101:1::185 80]
2021-08-07T01:19:35Z [debug] Created macvlan interface
2021-08-07T01:19:35Z [debug] Renamed macvlan to "net1"
2021-08-07T01:19:35Z [error] Unable to read sysctl value net.ipv6.conf.lo.disable_ipv6
2021-08-07T01:19:35Z [error] Unable to read sysctl value net.ipv6.conf.net1.disable_ipv6
2021-08-07T01:19:37Z [debug] Adding IPv6 route to gateway fe80::5054:ff:fe21:4d31 on macvlan interface
2021-08-07T01:19:37Z [debug] Added new default route with gateway fe80::5054:ff:fe21:4d31
2021-08-07T01:19:37Z [debug] Added iptables rule: iptables -t nat PREROUTING -i eth0 -p tcp --dport 80 -j DNAT --to-destination 2607:f8b0:4004:808::200e
2021-08-07T01:19:37Z [debug] Added iptables rule: iptables -t nat PREROUTING -i eth0 -p tcp --dport 8080 -j DNAT --to-destination 2600:1408:20:c81::3831:80
2021-08-07T01:19:37Z [debug] Added iptables rule: iptables -t nat PREROUTING -i eth0 -p tcp --dport 8888 -j DNAT --to-destination 2001:420:1101:1::185:80
2021-08-07T01:19:37Z [debug] Added iptables rule: iptables -t nat -o net1 -j SNAT --to-source fd2e:6f44:5dd8::64


@openshift-ci openshift-ci bot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Aug 6, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 6, 2021

@msherif1234: This pull request references Bugzilla bug 1989688, which is invalid:

  • expected the bug to target the "4.9.0" release, but it targets "---" instead

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

In response to this:

Bug 1989688: Add ipv6 support to egress-router-cni

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 6, 2021
@openshift-ci openshift-ci bot requested review from jluhrsen and trozet August 6, 2021 16:56
@msherif1234
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 6, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 6, 2021

@msherif1234: This pull request references Bugzilla bug 1989688, 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.9.0) matches configured target release for branch (4.9.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 (anusaxen@redhat.com), skipping review request.

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.

@msherif1234 msherif1234 changed the title Bug 1989688: Add ipv6 support to egress-router-cni Bug 1989688: Add IPv6 support to egress-router-cni Aug 6, 2021
@msherif1234
Copy link
Contributor Author

/test e2e-aws

@msherif1234 msherif1234 changed the title Bug 1989688: Add IPv6 support to egress-router-cni WIP Bug 1989688: Add IPv6 support to egress-router-cni Aug 6, 2021
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 6, 2021
@msherif1234 msherif1234 force-pushed the Bz_1989688 branch 2 times, most recently from f16aad6 to b9231e4 Compare August 7, 2021 00:26
@msherif1234 msherif1234 changed the title WIP Bug 1989688: Add IPv6 support to egress-router-cni Bug 1989688: Add IPv6 support to egress-router-cni Aug 7, 2021
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 7, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 7, 2021

@msherif1234: This pull request references Bugzilla bug 1989688, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.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 (anusaxen@redhat.com), skipping review request.

In response to this:

Bug 1989688: Add IPv6 support to egress-router-cni

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.

@msherif1234
Copy link
Contributor Author

/test e2e-aws

@msherif1234
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 7, 2021

@msherif1234: This pull request references Bugzilla bug 1989688, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.0) matches configured target release for branch (4.9.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 (anusaxen@redhat.com), skipping review request.

In response to this:

Bug 1989688: Add IPv6 support to egress-router-cni

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.

Copy link

@alexanderConstantinescu alexanderConstantinescu left a comment

Choose a reason for hiding this comment

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

In general, looks good, I mainly had some nits.

pkg/macvlan/macvlan.go Outdated Show resolved Hide resolved
pkg/macvlan/macvlan.go Outdated Show resolved Hide resolved
pkg/macvlan/macvlan.go Show resolved Hide resolved
pkg/macvlan/macvlan.go Outdated Show resolved Hide resolved
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
@alexanderConstantinescu

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2021
@knobunc
Copy link
Contributor

knobunc commented Aug 13, 2021

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: knobunc, msherif1234

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 Aug 13, 2021
@openshift-ci openshift-ci bot merged commit d7eeafd into openshift:master Aug 13, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 13, 2021

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

Bugzilla bug 1989688 has been moved to the MODIFIED state.

In response to this:

Bug 1989688: Add IPv6 support to egress-router-cni

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
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
Development

Successfully merging this pull request may close these issues.

None yet

3 participants