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

[DownstreamMerge] 9-7-22 merge #1264

Merged
merged 20 commits into from Sep 9, 2022
Merged

[DownstreamMerge] 9-7-22 merge #1264

merged 20 commits into from Sep 9, 2022

Conversation

flavio-fernandes
Copy link
Contributor

No conflicts! 🥳

oribon and others added 20 commits August 7, 2022 10:20
@oribon
Add option to specify container runtime
9c7c8d9 
This is needed to run the tests when a container runtime
other than docker is installed.

Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
@oribon
Refactor ex_gw e2e to support net=host containers
4dad53a 
Currently running the external gateways e2e tests is possible
only on kind deployments.

Adding support for using a host-networked container
instead of leveraging the kind network allows running
the tests from a host that can access the cluster.

Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
@oribon
Remove unused flag
70942ca 
CONTAINER_RUNTIME environment variable being defined causes:
```
flag provided but not defined: -container-runtime
```

Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
@JacobTanenbaum
take advantage of ginkgo framework to make master_test.go simpler
70b1d83 
There is a lot of duplicated code in master_test.go that can be removed
by making better use of ginkgo.BeforeEach()

Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
@dcbw
policy: fix log message and clarify comment
ca14a95 
Signed-off-by: Dan Williams <dcbw@redhat.com>
@jcaamano
Bump containernetworking
a6a41d9 
go get github.com/containernetworking/plugins@v1.1.1

go: upgraded github.com/Microsoft/hcsshim v0.8.16 => v0.8.20
go: upgraded github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae => v1.1.0
go: upgraded github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 => v1.0.1
go: upgraded github.com/containernetworking/cni v0.8.1 => v1.0.1
go: upgraded github.com/containernetworking/plugins v0.9.1 => v1.1.1
go: upgraded github.com/coreos/go-iptables v0.5.0 => v0.6.0
go: upgraded github.com/cpuguy83/go-md2man/v2 v2.0.0 => v2.0.1
go: upgraded github.com/onsi/gomega v1.14.0 => v1.15.0
go: upgraded github.com/russross/blackfriday/v2 v2.0.1 => v2.1.0
go: upgraded github.com/spf13/afero v1.4.1 => v1.6.0
go: upgraded github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae => v0.0.0-20210104183010-2eb08e3e575f

Had to add a replace to break a circular dependency with containerd:

github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.20

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
@jcaamano
Bump k8snetworkplumbingwg/network-attachment-definition-client
decf441 
go get github.com/k8snetworkplumbingwg/network-attachment-definition-client

go: upgraded github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200626054723-37f83d1996bc => v1.3.0
go: upgraded github.com/onsi/ginkgo v1.16.4 => v1.16.5

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
@jcaamano
Vendor netlink from a replacement repo
cf16ff1 
This commit can be reverted when
vishvananda/netlink#784
merges and we can re-vendor the next netlink release

Signed-off-by: Surya Seetharaman <suryaseetharaman.9@gmail.com>
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
@jcaamano
Changes required by new version of containernetworking
c574d36 
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
@jcaamano
Changes required by new version of gomega
294ec69 
Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
@jcaamano
Vendoring
3c959b3 
go mod vendor && go mod tidy

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
@dcbw
Merge pull request #3139 from dcbw/fix-policy-log
2054912 
policy: fix log message and clarify comment
@trozet
Merge pull request #2791 from oribon/ex_gw_e2e_on_host
fdb204a 
External gateways E2E on host network
@kyrtapz
Use a custom dialer for GRPC to allow connectivity over a socks proxy
6af660e 
grpc-go only supports HTTP proxy: https://github.com/grpc/grpc-go/blob/master/Documentation/proxy.md.
Use a custom dialer to enable socks proxy.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
@dcbw
Merge pull request #3121 from JacobTanenbaum/master-testing
71ba0ff 
take advantage of ginkgo framework to make master_test.go simpler
@dcbw
Merge pull request #3137 from jcaamano/bump-containernetworking
22140d8 
Bump containernetworking
@JacobTanenbaum
correct hybrid overlay tests
5c89847 
needed to add a NodeHostAddress to the test node in hybrid_test.go

Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
@dcbw
Merge pull request #3147 from JacobTanenbaum/fix-testing
1f94910 
correct hybrid overlay tests
@trozet
Merge pull request #3144 from kyrtapz/grpc_proxy_dialer
8566415 
Use a custom dialer for GRPC to allow connectivity over a socks proxy
@flavio-fernandes
Merge remote-tracking branch 'ups/master' into 9-7-22_merge
6fd177d
@openshift-ci openshift-ci bot requested review from abhat and dcbw September 7, 2022 22:29
@flavio-fernandes
Copy link
Contributor Author

/assign @trozet

@flavio-fernandes
Copy link
Contributor Author

/retest-required

@trozet
Copy link
Contributor

trozet commented Sep 8, 2022

/lgtm

@flavio-fernandes
Copy link
Contributor Author

/test e2e-aws-ovn-shared-to-local-gateway-mode-migration

@flavio-fernandes
Copy link
Contributor Author

/test 4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade
/test 4.12-upgrade-from-stable-4.11-local-gateway-e2e-aws-ovn-upgrade

@flavio-fernandes
Copy link
Contributor Author

/test e2e-aws-ovn-shared-to-local-gateway-mode-migration

1 similar comment
@flavio-fernandes
Copy link
Contributor Author

/test e2e-aws-ovn-shared-to-local-gateway-mode-migration

@flavio-fernandes
Copy link
Contributor Author

/test 4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2022 •
edited

@flavio-fernandes: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-openstack-ovn 6fd177d link false /test e2e-openstack-ovn
ci/prow/e2e-azure-ovn 6fd177d link false /test e2e-azure-ovn
ci/prow/e2e-hypershift 6fd177d link false /test e2e-hypershift
ci/prow/okd-e2e-gcp-ovn 6fd177d link false /test okd-e2e-gcp-ovn
ci/prow/e2e-aws-ovn-serial 6fd177d link false /test e2e-aws-ovn-serial

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.

@flavio-fernandes
Copy link
Contributor Author

/test 4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade

@tssurya
Copy link
Contributor

tssurya commented Sep 9, 2022

/lgtm

@tssurya
Copy link
Contributor

tssurya commented Sep 9, 2022

/shrug
bad bot not listening to tim's lgtm...

@openshift-ci openshift-ci bot added the ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯ label Sep 9, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flavio-fernandes, trozet, tssurya

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 9, 2022
@openshift-merge-robot openshift-merge-robot merged commit a0e2733 into openshift:master Sep 9, 2022
@flavio-fernandes flavio-fernandes deleted the 9-7-22_merge branch September 9, 2022 14:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abhat abhat Awaiting requested review from abhat

@dcbw dcbw Awaiting requested review from dcbw dcbw is a code owner

Assignees

@tssurya tssurya

@trozet trozet

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
9 participants
@flavio-fernandes @trozet @tssurya @openshift-merge-robot @oribon @JacobTanenbaum @dcbw @jcaamano @kyrtapz