Merge pull request #98 from ExpediaGroup/v3.3.3-log4shell-fix-1

Added hotfix
ExpediaGroup · Dec 17, 2021 · 23a3dbe · 23a3dbe
2 parents 66f6bcc + fb5eea0
commit 23a3dbe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.3.3-log4shell-fix-1] - 2021-12-16
+- Set env var `LOG4J_FORMAT_MSG_NO_LOOKUPS=”true”` for WD containers for log4j-shell bug. HotFix for 3.3.3 branch.
+
 ## [3.3.3] - 2021-04-06
 ### Added
 - Variable to configure k8s pod replicas.

diff --git a/k8s.tf b/k8s.tf
@@ -62,6 +62,10 @@ resource "kubernetes_deployment" "waggle_dance" {
             name  = "HIVE_SITE_XML"
             value = var.alluxio_endpoints == [] ? "" : base64encode(data.template_file.hive_site_xml.rendered)
           }
+          env {
+              name  = "LOG4J_FORMAT_MSG_NO_LOOKUPS"
+              value = "true"
+          }          
           resources {
             limits {
               memory = "${local.memory_limit}Mi"

diff --git a/templates/waggledance.json b/templates/waggledance.json
@@ -42,6 +42,10 @@
       {
         "name": "BASTION_SSH_KEY_ARN",
         "value": "${bastion_ssh_key_arn}"
+      },
+      {
+        "name": "LOG4J_FORMAT_MSG_NO_LOOKUPS",
+        "value": "true"
       }
     ],
     "healthCheck": {