From cd958ad0b938edbd9b83db916ba44d4ff760bae3 Mon Sep 17 00:00:00 2001
From: David Richer <104082608+richerdavid@users.noreply.github.com>
Date: Thu, 14 Jul 2022 12:20:23 -0400
Subject: [PATCH 1/2] No longer set default value for
 AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER   * It's already set in aws-k8s-cni.yaml

---
 nodejs/eks/cmd/provider/cni.ts | 2 --
 1 file changed, 2 deletions(-)

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" });

From 72f7b9c6eeb774e0c9c8c120316055dbb6a6fb14 Mon Sep 17 00:00:00 2001
From: David Richer <104082608+richerdavid@users.noreply.github.com>
Date: Thu, 14 Jul 2022 12:26:54 -0400
Subject: [PATCH 2/2] Updated CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4804cd106..d02a13a4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Unreleased
-(None)
+- 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