From 8ae0e008c2951a18c1d122dfc8b627967883b7cb Mon Sep 17 00:00:00 2001 From: David Richer <104082608+richerdavid@users.noreply.github.com> Date: Wed, 27 Jul 2022 10:11:17 -0400 Subject: [PATCH] No longer set default value for AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER (#737) Co-authored-by: Paul Stack --- CHANGELOG.md | 4 +++- nodejs/eks/cmd/provider/cni.ts | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4789ed49c..7b9b94881 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## Unreleased -- Due to https://github.com/pulumi/pulumi/issues/7012 including the provider in the generated SDK never really worked. This is removed now. Note - existing uses in Nodejs should not be affected. +- BREAKING CHANGE: Due to https://github.com/pulumi/pulumi/issues/7012 including the provider in the generated SDK never really worked. This is removed now. Note - existing uses in Nodejs should not be affected. [#746](https://github.com/pulumi/pulumi-eks/pull/746) +- Fix issue with duplicated AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER env var on aws-node daemonset. + [#737](https://github.com/pulumi/pulumi-eks/pull/737) ## 0.41.2 (Released Jul 12, 2022) - Allow removal of default Kubernetes addons diff --git a/nodejs/eks/cmd/provider/cni.ts b/nodejs/eks/cmd/provider/cni.ts index 9a3687a8d..2b86d3907 100644 --- a/nodejs/eks/cmd/provider/cni.ts +++ b/nodejs/eks/cmd/provider/cni.ts @@ -142,8 +142,6 @@ function computeVpcCniYaml(cniYamlText: string, args: VpcCniInputs): string { } if (args.cniConfigureRpfilter) { env.push({ name: "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER", value: args.cniConfigureRpfilter ? "true" : "false" }); - } else { - env.push({ name: "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER", value: "false" }); } if (args.cniCustomNetworkCfg) { env.push({ name: "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG", value: args.cniCustomNetworkCfg ? "true" : "false" });