Merge branch 'main' into update-keywords

cds-snc · Dec 3, 2024 · 5a4cfc8 · 5a4cfc8
2 parents eeb6641 + 85bc2d2
commit 5a4cfc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/aws/github/terraform-secrets.tf b/aws/github/terraform-secrets.tf
@@ -7,7 +7,7 @@ resource "github_actions_secret" "account_id" {
 resource "github_actions_secret" "notify_dev_slack_webhook" {
   count           = var.env == "production" ? 1 : 0
   repository      = data.github_repository.notification_terraform.name
-  secret_name     = "NOTIFY_${upper(var.env)}_SLACK_WEBHOOK"
+  secret_name     = "NOTIFY_DEV_SLACK_WEBHOOK"
   plaintext_value = var.notify_dev_slack_webhook
 }
 

diff --git a/env/production_config.tfvars b/env/production_config.tfvars
@@ -19,8 +19,8 @@ eks_addon_coredns_version       = "v1.11.3-eksbuild.1"
 eks_addon_kube_proxy_version    = "v1.31.0-eksbuild.5"
 eks_addon_vpc_cni_version       = "v1.18.5-eksbuild.1"
 eks_addon_ebs_driver_version    = "v1.35.0-eksbuild.1"
-eks_node_ami_version            = "1.31.0-20241109"
-eks_karpenter_ami_id            = "ami-0a10a21aafe2fc2bc"
+eks_node_ami_version            = "1.31.2-20241121"
+eks_karpenter_ami_id            = "ami-0d173639ea50ec625"
 non_api_waf_rate_limit          = 500
 api_waf_rate_limit              = 30000
 sign_in_waf_rate_limit          = 100