Merge pull request #889 from bnaydenov/issue_888_fix

CloudWatchLogsAddon: setting logRetentionDays param does not work and not set cloudWatchLogs.logRetentionDays when creating CloudWatch Log Groups
aws-quickstart · Dec 13, 2023 · 1dfc828 · 1dfc828
2 parents 69d730e + 20a9fdb
commit 1dfc828
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/addons/cloudwatch-logs/iam-policy.ts b/lib/addons/cloudwatch-logs/iam-policy.ts
@@ -15,7 +15,9 @@ export function getCloudWatchLogsPolicyDocument() : Statement[] {
                 "logs:DescribeLogStreams",
                 "logs:DescribeLogGroups",
                 "logs:CreateLogStream",
-                "logs:CreateLogGroup"
+                "logs:CreateLogGroup",
+                "logs:PutRetentionPolicy",
+                "logs:DeleteRetentionPolicy"
             ],
             "Resource": "*"
         }

diff --git a/lib/addons/cloudwatch-logs/index.ts b/lib/addons/cloudwatch-logs/index.ts
@@ -108,7 +108,7 @@ function populateValues(clusterInfo: ClusterInfo, helmOptions: CloudWatchLogsAdd
     setPath(values, "cloudWatchLogs.logGroupName", `${helmOptions.logGroupPrefix}/workloads`);
     setPath(values, "cloudWatchLogs.logGroupTemplate", `${helmOptions.logGroupPrefix}/$kubernetes['namespace_name']`);
     setPath(values, "cloudWatchLogs.logStreamTemplate", "$kubernetes['container_name'].$kubernetes['pod_name']");
-    setPath(values, "cloudWatchLogs.log_key", "log");
-    setPath(values, "cloudWatchLogs.log_retention_days", helmOptions.logRetentionDays);
+    setPath(values, "cloudWatchLogs.logKey", "log");
+    setPath(values, "cloudWatchLogs.logRetentionDays", helmOptions.logRetentionDays);
     return values;
 }