From 8c4f16fee0ee058e53448490b86af65d1e2045bb Mon Sep 17 00:00:00 2001 From: Gerald Pape Date: Wed, 4 Sep 2024 13:48:30 +0200 Subject: [PATCH] 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 dd32b0dd43176f625d375844473b8a69166076d7. * Add changelog entry --------- Co-authored-by: GitHub Action --- CHANGELOG.md | 4 ++++ .../templates/_cilium_helmrelease_config.yaml | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc904d1a..bec48338 100644 --- 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 index 006f483f..1b49f007 100644 --- 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"