Rebase from upstream

[gryf]

/lgtm

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek, gryf

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: - ~~[OWNERS](https://github.com/openshift/kuryr-kubernetes/blob/master/OWNERS)~~ [dulek,gryf] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

[MaysaMacedo]

/override ci/prow/e2e-openstack-kuryr

The test failure is being fixed here https://github.com/openshift/openstack-test/pull/43

[openshift-ci[bot]]

@MaysaMacedo: Overrode contexts on behalf of MaysaMacedo: ci/prow/e2e-openstack-kuryr

In response to [this](https://github.com/openshift/kuryr-kubernetes/pull/683#issuecomment-1193816891): >/override ci/prow/e2e-openstack-kuryr > >The test failure is being fixed here https://github.com/openshift/openstack-test/pull/43 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.

[openshift-ci[bot]]

@dulek: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).