UNCLASSIFIED - NO CUI

Skip to content

SKIP UPGRADE moves log4j config init container over to ssc image instead of alpine

Daniel Pritchett requested to merge 52-finishes-mr-139-mr-feedback into main

General MR

Summary

  • Adds extensive walkthrough of how+why our Fortify log4j XML configuration customization ended up in its current design. See docs/log-configuration.md in this MR for more.
  • Fixes missing environment variable bug by swapping out the alpine initContainer.image with another ssc image
  • Adds some additional notes to the log output in wait.sh to make it more clear what's being waited for and why it matters if the job fails

Relevant logs/screenshots

New Markdown+Mermaid developer walkthrough on how/why the logging is this way

See rendered Markdown with diagrams here: https://repo1.dso.mil/big-bang/product/packages/fortify/-/blob/b0797868138590fcedb9ff36f6bafdb92b3dc81f/docs/log-configuration.md

logs of the log4j-config-pinner container successfully interpolating COM_FORTIFY_SSC_HOME now that we've moved off of alpine

image

Updated wait.sh

  • now more explicit about logging exactly what it's waiting for
  • it passed locally
  • it took almost 10 minutes to pass, with fortify database seeds running for nearly 10 minutes and risking a flux timeout / retry that can break CI (or actual customer deploys, assuming 10 minute timeouts are their standard)

image

Linked Issue

follow-on bugfix to fortify#52

Upgrade Notices

N/A

Edited by Daniel Pritchett

Merge request reports