Skip to content

Commit cb32ce6

Browse files
authored
nit: Update README to separate ENI Tags from Subnet Tags (#3508)
* Separate ENI Tags from Subnet Tags * Create new section for subnet tag(s) in README * nit: README update --------- Co-authored-by: Christian DiRubbio <[email protected]>
1 parent 336e73e commit cb32ce6

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

README.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,6 @@ Downgrade considerations
796796
This plugin interacts with the following tags on ENIs:
797797

798798
* `cluster.k8s.amazonaws.com/name`
799-
* `kubernetes.io/role/cni`
800799
* `node.k8s.amazonaws.com/instance_id`
801800
* `node.k8s.amazonaws.com/no_manage`
802801

@@ -805,17 +804,6 @@ This plugin interacts with the following tags on ENIs:
805804
The tag `cluster.k8s.amazonaws.com/name` will be set to the cluster name of the
806805
aws-node daemonset which created the ENI.
807806

808-
#### CNI role tag
809-
810-
The tag `kubernetes.io/role/cni` is read by the aws-node daemonset to determine
811-
if a secondary subnet can be used for creating secondary ENIs.
812-
813-
This tag is not set by the cni plugin itself, but rather must be set by a user
814-
to indicate that a subnet can be used for secondary ENIs. Secondary subnets
815-
to be used must have this tag. The primary subnet (node's subnet) is not
816-
required to be tagged.
817-
818-
819807
#### Instance ID tag
820808

821809
The tag `node.k8s.amazonaws.com/instance_id` will be set to the instance ID of
@@ -836,6 +824,21 @@ value for the Kubelet's `--max-pods` configuration option. Consider also
836824
updating the `MAX_ENI` and `--max-pods` configuration options on this plugin
837825
and the kubelet respectively if you are making use of this tag.
838826

827+
## Subnet tags related to Allocation
828+
829+
This plugin additionally interacts with the `kubernetes.io/role/cni` tag on subnets when `ENABLE_SUBNET_DISCOVERY` is set to `true`.
830+
831+
#### CNI role tag
832+
833+
The tag `kubernetes.io/role/cni` is read by the aws-node daemonset to determine
834+
if a secondary subnet can be used for creating secondary ENIs.
835+
836+
This tag is not set by the cni plugin itself, but rather must be set by a user
837+
to indicate that a subnet can be used for secondary ENIs. Secondary subnets
838+
to be used must have this tag. The primary subnet (node's subnet) is not
839+
required to be tagged.
840+
841+
839842
## Container Runtime
840843

841844
For VPC CNI >=v1.12.0, IPAMD have switched to use an on-disk file `/var/run/aws-node/ipam.json` to track IP allocations, thus became container runtime agnostic and no longer requires access to Container Runtime Interface(CRI) socket.

0 commit comments

Comments
 (0)