windows prefix delegation settings

aws · Dec 18, 2023 · 4d34d69 · 4d34d69
1 parent 593d58d
commit 4d34d69
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/charts/aws-vpc-cni/README.md b/charts/aws-vpc-cni/README.md
@@ -42,6 +42,11 @@ The following table lists the configurable parameters for this chart and their d
 | `env`                   | List of environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) |
 | `enableWindowsIpam`     | Enable windows support for your cluster                 | `false`                             |
 | `enableNetworkPolicy`   | Enable Network Policy Controller and Agent for your cluster | `false`                         |
+| `enableWindowsPrefixDelegation` | Enable windows prefix delegation support for your cluster | `false`                   |
+| `warmWindowsPrefixTarget` | Warm prefix target value for Windows prefix delegation | `0`                                |
+| `warmWindowsIPTarget`   | Warm IP target value for Windows prefix delegation      | `1`                                 |
+| `minimumWindowsIPTarget`| Minimum IP target value for Windows prefix delegation   | `3`                                 |
+| `branchENICooldown`     | Number of seconds that branch ENIs remain in cooldown   | `60`                                |
 | `fullnameOverride`      | Override the fullname of the chart                      | `aws-node`                          |
 | `image.tag`             | Image tag                                               | `v1.15.5`                           |
 | `image.domain`          | ECR repository domain                                   | `amazonaws.com`                     |

diff --git a/charts/aws-vpc-cni/values.yaml b/charts/aws-vpc-cni/values.yaml
@@ -89,13 +89,18 @@ env:
 # You can then annotate and label the original aws-node resources and 'adopt' them into a helm release
 originalMatchLabels: false
 
-enableWindowsIpam: "false"
+# Settings for aws-vpc-cni ConfigMap
+# - Network Policy settings
 enableNetworkPolicy: "false"
+# - Windows settings
+enableWindowsIpam: "false"
+# - Windows Prefix Delegation settings
 enableWindowsPrefixDelegation: "false"
-warmWindowsPrefixTarget: "0"
-warmWindowsIPTarget: "0"
-minimumWindowsIPTarget: "0"
-branchENICooldown: "60"
+warmWindowsPrefixTarget: 0
+warmWindowsIPTarget: 1
+minimumWindowsIPTarget: 3
+# - Security Groups for Pods settings
+branchENICooldown: 60
 
 cniConfig:
   enabled: false

diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
@@ -282,6 +282,11 @@ metadata:
 data:
   enable-windows-ipam: "false"
   enable-network-policy-controller: "false"
+  enable-windows-prefix-delegation: "false"
+  warm-prefix-target: "0"
+  warm-ip-target: "1"
+  minimum-ip-target: "3"
+  branch-eni-cooldown: "60"
 ---
 # Source: aws-vpc-cni/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
@@ -282,6 +282,11 @@ metadata:
 data:
   enable-windows-ipam: "false"
   enable-network-policy-controller: "false"
+  enable-windows-prefix-delegation: "false"
+  warm-prefix-target: "0"
+  warm-ip-target: "1"
+  minimum-ip-target: "3"
+  branch-eni-cooldown: "60"
 ---
 # Source: aws-vpc-cni/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
@@ -282,6 +282,11 @@ metadata:
 data:
   enable-windows-ipam: "false"
   enable-network-policy-controller: "false"
+  enable-windows-prefix-delegation: "false"
+  warm-prefix-target: "0"
+  warm-ip-target: "1"
+  minimum-ip-target: "3"
+  branch-eni-cooldown: "60"
 ---
 # Source: aws-vpc-cni/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
@@ -282,6 +282,11 @@ metadata:
 data:
   enable-windows-ipam: "false"
   enable-network-policy-controller: "false"
+  enable-windows-prefix-delegation: "false"
+  warm-prefix-target: "0"
+  warm-ip-target: "1"
+  minimum-ip-target: "3"
+  branch-eni-cooldown: "60"
 ---
 # Source: aws-vpc-cni/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1