Configure cilium cni customConf in cluster-aws chart (#800)

* Update cluster chart version to 1.2.1-c699446a547ecd17eb7ad8f706478da0d6031383 * Configure cilium cni customConf in cluster-aws chart * Revert "Update cluster chart version to 1.2.1-c699446a547ecd17eb7ad8f706478da0d6031383" This reverts commit dd32b0d. * Add changelog entry --------- Co-authored-by: GitHub Action <[email protected]>
giantswarm · Sep 4, 2024 · 8c4f16f · 8c4f16f
1 parent 8925698
commit 8c4f16f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Set provider specific configuration for cilium CNI ENI values.
+
 ## [2.1.0] - 2024-08-29
 
 ### Changed

diff --git a/helm/cluster-aws/templates/_cilium_helmrelease_config.yaml b/helm/cluster-aws/templates/_cilium_helmrelease_config.yaml
@@ -20,6 +20,16 @@ cni:
   # Use https://github.com/giantswarm/cilium-app/blob/main/helm/cilium/templates/cilium-cni-configmap.yaml
   customConf: true
   configMap: cilium-cni-configuration
+cniCustomConf:
+  eni:
+    firstInterfaceIndex: 1
+    securityGroupTags:
+      "kubernetes.io/cluster/{{ include "resource.default.name" $ }}": "owned"
+      "sigs.k8s.io/cluster-api-provider-aws/association": "secondary"
+    subnetTags:
+      "sigs.k8s.io/cluster-api-provider-aws/cluster/{{ include "resource.default.name" $ }}": "owned"
+      "sigs.k8s.io/cluster-api-provider-aws/association": "secondary"
+      "sigs.k8s.io/cluster-api-provider-aws/role": "private"
 extraEnv:
   - name: CNI_CONF_NAME
     value: "21-cilium.conflist"