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

CNI: improve plugin chaining #24956

Merged
merged 6 commits into from
May 4, 2023
Merged

CNI: improve plugin chaining #24956

merged 6 commits into from
May 4, 2023

Commits on May 3, 2023

  1. mechanical: fix cni lint errors 

    Just some capitalized errors that were annoying the linter.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
    @squeed
    squeed committed May 3, 2023
    Configuration menu
    Copy the full SHA
    200ce71 View commit details
    Browse the repository at this point in the history

  2. plugins/cni: make CNI chaining mode explicit 

    We determined exactly how to chain by reading the CNI network name. This
is fragile, and means that end-users can't easily configure chaining for
their own networks.

This keeps the existing logic but adds an explicit chaining-mode field
in the CNI configuration.

Additionally: remove the "portmap" plugin, since all it did was signify
that the network "portmap" was the same as "cilium". There are cleaner
ways to handle that.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
    @squeed
    squeed committed May 3, 2023
    Configuration menu
    Copy the full SHA
    6fd2d55 View commit details
    Browse the repository at this point in the history

  3. go mod vendor 

    Signed-off-by: Casey Callendrello <cdc@isovalent.com>
    @squeed
    squeed committed May 3, 2023
    Configuration menu
    Copy the full SHA
    985345e View commit details
    Browse the repository at this point in the history

  4. cni/agent: add cni-chaining-target option 

    People would like to automatically inject Cilium in to CNI configuration
files. Add an option to the daemon that watches for networks of a given
name and injects Cilium into it.

We already supported this in a limited sense with aws-cni, but let's
generalize it to support arbitrary CNI networks.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
    @squeed
    squeed committed May 3, 2023
    Configuration menu
    Copy the full SHA
    99a75d4 View commit details
    Browse the repository at this point in the history

  5. install: wire up cni.chainingTarget 

    Add the option to set a CNI chaining target explicitly. Also, clean up
some of the defaulting around cni chaining mode.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
    @squeed
    squeed committed May 3, 2023
    Configuration menu
    Copy the full SHA
    73cf477 View commit details
    Browse the repository at this point in the history

  6. daemon/cni: correctly handle empty chaining mode 

    There was a logic error when handling an unset chaining mode.

Signed-off-by: Casey Callendrello <cdc@isovalent.com>
    @squeed
    squeed committed May 3, 2023
    Configuration menu
    Copy the full SHA
    0f75ecd View commit details
    Browse the repository at this point in the history