[aws-vpc-cni] added eniconfig template

stable/aws-vpc-cni/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: aws-vpc-cni
-version: 1.1.2
+version: 1.1.3
 appVersion: "v1.7.5"
 description: A Helm chart for the AWS VPC CNI
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png

stable/aws-vpc-cni/README.md

@@ -31,6 +31,11 @@ The following table lists the configurable parameters for this chart and their d
 | `affinity`              | Map of node/pod affinities                              | `{}`                                |
 | `cniConfig.enabled`     | Enable overriding the default 10-aws.conflist file      | `false`                             |
 | `cniConfig.fileContents`| The contents of the custom cni config file              | `nil`                               |
+| `eniConfig.create`      | Specifies whether to create ENIConfig resource(s)       | `false`                             |
+| `eniConfig.region`      | Region to use when generating ENIConfig resource names  | `us-west-2`                         |
+| `eniConfig.subnets`     | A map of AZ identifiers to config per AZ                | `nil`                               |
+| `eniConfig.subnets.id`  | The ID of the subnet within the AZ which will be used in the ENIConfig | `nil`                |
+| `eniConfig.subnets.securityGroups`  | The IDs of the security groups which will be used in the ENIConfig | `nil`        |
 | `env`                   | List of environment variables. See [here](https://github.com/aws/amazon-vpc-cni-k8s#cni-configuration-variables) for options | (see `values.yaml`) |
 | `fullnameOverride`      | Override the fullname of the chart                      | `aws-node`                          |
 | `image.region`          | ECR repository region to use. Should match your cluster | `us-west-2`                         |

stable/aws-vpc-cni/templates/eniconfig.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.eniConfig.create }}
+{{- range $key, $value := (required ".Values.eniConfig.subnets must be specified" .Values.eniConfig.subnets) }}
+apiVersion: crd.k8s.amazonaws.com/v1alpha1
+kind: ENIConfig
+metadata:
+  name: {{ required ".Values.eniConfig.region must be specified" $.Values.eniConfig.region }}{{ $key }}
+spec:
+  {{- if $value.securityGroups }}
+  securityGroups:
+    {{- range $sg := $value.securityGroups }}
+    - {{ $sg }}
+    {{- end }}
+  {{- end }}
+  subnet: {{ $value.id }}
+---
+{{- end }}
+{{- end }}

stable/aws-vpc-cni/values.yaml

@@ -139,3 +139,23 @@ affinity:
               operator: NotIn
               values:
                 - fargate
+
+eniConfig:
+  # Specifies whether ENIConfigs should be created
+  create: false
+  region: us-west-2
+  subnets:
+    # Key identifies the AZ
+    # Value contains the subnet ID and security group IDs within that AZ
+    # a:
+    #   id: subnet-123
+    #   securityGroups:
+    #   - sg-123
+    # b:
+    #   id: subnet-456
+    #   securityGroups:
+    #   - sg-456
+    # c:
+    #   id: subnet-789
+    #   securityGroups:
+    #   - sg-789