Skip to content

passes K8S_POD_TENANT and extra cni-args to cni plugin#1

Merged
h-w-chen merged 1 commit intoarktos-intfrom
hw-add-tenant-in-sandboxmetadata
Jun 17, 2020
Merged

passes K8S_POD_TENANT and extra cni-args to cni plugin#1
h-w-chen merged 1 commit intoarktos-intfrom
hw-add-tenant-in-sandboxmetadata

Conversation

@h-w-chen
Copy link
Copy Markdown
Collaborator

What type of PR is this?

/kind feature

What this PR does / why we need it:

containerd is to be extended to pass pod tenant and key-value pairs in cni-args annotation to cni plugin in form of CNI_ARGS.

containerd, as one of the container runtimes used by Arktos, passes very limited information down to cni plugins. Based on arktos networking design proposal, cni plugin expects CNI_ARGS to have K8S_POD_TENANT and optional key-value pairs as specified by pod cni-args annotation. Containerd is extended to recognize addition of "tenant" field in arktos CRI extension, and ensure the proper args being passed on to CNI as CNI_ARGS.

The extension/customization of containerd include only the new tenant field of PodSandboxMetadata. Any other Arktos CRI extensions not in the scope.

This is part of Arktos support for multi-tenancy multi-network.

@h-w-chen h-w-chen added the customization extend/customize the mainstream containerd label Jun 16, 2020
@yb01
Copy link
Copy Markdown

yb01 commented Jun 16, 2020

LGTM

@h-w-chen h-w-chen merged commit e594285 into arktos-int Jun 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

customization extend/customize the mainstream containerd

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants