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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DownstreamMerge] 9-7-22 merge #1264

Merged
merged 20 commits into from Sep 9, 2022

Commits on Aug 7, 2022

  1. Add option to specify container runtime

    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 committed Aug 7, 2022
    Copy the full SHA
    9c7c8d9 View commit details
    Browse the repository at this point in the history
  2. Refactor ex_gw e2e to support net=host containers

    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 committed Aug 7, 2022
    Copy the full SHA
    4dad53a View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. Remove unused flag

    CONTAINER_RUNTIME environment variable being defined causes:
    ```
    flag provided but not defined: -container-runtime
    ```
    
    Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
    oribon committed Aug 8, 2022
    Copy the full SHA
    70942ca View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. take advantage of ginkgo framework to make master_test.go simpler

    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>
    JacobTanenbaum committed Aug 22, 2022
    Copy the full SHA
    70b1d83 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. policy: fix log message and clarify comment

    Signed-off-by: Dan Williams <dcbw@redhat.com>
    dcbw committed Sep 2, 2022
    Copy the full SHA
    ca14a95 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. Bump containernetworking

    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 committed Sep 5, 2022
    Copy the full SHA
    a6a41d9 View commit details
    Browse the repository at this point in the history
  2. Bump k8snetworkplumbingwg/network-attachment-definition-client

    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 committed Sep 5, 2022
    Copy the full SHA
    decf441 View commit details
    Browse the repository at this point in the history
  3. Vendor netlink from a replacement repo

    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 committed Sep 5, 2022
    Copy the full SHA
    cf16ff1 View commit details
    Browse the repository at this point in the history
  4. Changes required by new version of containernetworking

    Signed-off-by: Jaime Caama帽o Ruiz <jcaamano@redhat.com>
    jcaamano committed Sep 5, 2022
    Copy the full SHA
    c574d36 View commit details
    Browse the repository at this point in the history
  5. Changes required by new version of gomega

    Signed-off-by: Jaime Caama帽o Ruiz <jcaamano@redhat.com>
    jcaamano committed Sep 5, 2022
    Copy the full SHA
    294ec69 View commit details
    Browse the repository at this point in the history
  6. Vendoring

    go mod vendor && go mod tidy
    
    Signed-off-by: Jaime Caama帽o Ruiz <jcaamano@redhat.com>
    jcaamano committed Sep 5, 2022
    Copy the full SHA
    3c959b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. Merge pull request #3139 from dcbw/fix-policy-log

    policy: fix log message and clarify comment
    dcbw committed Sep 6, 2022
    Copy the full SHA
    2054912 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2791 from oribon/ex_gw_e2e_on_host

    External gateways E2E on host network
    trozet committed Sep 6, 2022
    Copy the full SHA
    fdb204a View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Use a custom dialer for GRPC to allow connectivity over a socks proxy

    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>
    kyrtapz committed Sep 7, 2022
    Copy the full SHA
    6af660e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3121 from JacobTanenbaum/master-testing

    take advantage of ginkgo framework to make master_test.go simpler
    dcbw committed Sep 7, 2022
    Copy the full SHA
    71ba0ff View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3137 from jcaamano/bump-containernetworking

    Bump containernetworking
    dcbw committed Sep 7, 2022
    Copy the full SHA
    22140d8 View commit details
    Browse the repository at this point in the history
  4. correct hybrid overlay tests

    needed to add a NodeHostAddress to the test node in hybrid_test.go
    
    Signed-off-by: Jacob Tanenbaum <jtanenba@redhat.com>
    JacobTanenbaum committed Sep 7, 2022
    Copy the full SHA
    5c89847 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #3147 from JacobTanenbaum/fix-testing

    correct hybrid overlay tests
    dcbw committed Sep 7, 2022
    Copy the full SHA
    1f94910 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #3144 from kyrtapz/grpc_proxy_dialer

    Use a custom dialer for GRPC to allow connectivity over a socks proxy
    trozet committed Sep 7, 2022
    Copy the full SHA
    8566415 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    6fd177d View commit details
    Browse the repository at this point in the history