From 9934302947bf4c841a9f0dde55ad942bd22115dd Mon Sep 17 00:00:00 2001 From: Adam Martin <42001113+amartin120@users.noreply.github.com> Date: Wed, 28 Aug 2024 10:07:50 -0400 Subject: [PATCH] more conflict fixes (#211) * updates for rancher v2.8.6 (#206) * AUTOMATION: SSF Prod Chart Update for stigatron * AUTOMATION: SSF Prod Chart Update for stigatron * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions (#195) * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions * Enabled 1.29 * Update img/app/chart versions for stigatron --------- Signed-off-by: Adam Martin Co-authored-by: Adam Martin * update airgapped-docs to 0.1.6 (#198) Signed-off-by: Adam Martin * updates for rancher v2.7.15 (#200) Signed-off-by: Adam Martin * Rancher 2.8.6 (#202) * updates for rancher v2.8.6 Signed-off-by: Adam Martin * readme update Signed-off-by: Adam Martin --------- Signed-off-by: Adam Martin * Fix merge issues (#205) * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions (#197) * AUTOMATION: SSF Prod Chart Update for stigatron * AUTOMATION: SSF Prod Chart Update for stigatron * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions (#195) * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions * Enabled 1.29 * Update img/app/chart versions for stigatron --------- Signed-off-by: Adam Martin Co-authored-by: Adam Martin --------- Signed-off-by: Adam Martin Co-authored-by: Carbide SSF Co-authored-by: Adam Toy * update airgapped-docs to 0.1.6 (#199) * AUTOMATION: SSF Prod Chart Update for stigatron * AUTOMATION: SSF Prod Chart Update for stigatron * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions (#195) * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions * Enabled 1.29 * Update img/app/chart versions for stigatron --------- Signed-off-by: Adam Martin Co-authored-by: Adam Martin * update airgapped-docs to 0.1.6 (#198) Signed-off-by: Adam Martin --------- Signed-off-by: Adam Martin Co-authored-by: Carbide SSF Co-authored-by: Adam Toy * updates for rancher v2.7.15 (#201) * AUTOMATION: SSF Prod Chart Update for stigatron * AUTOMATION: SSF Prod Chart Update for stigatron * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions (#195) * Add support for RKE2 v1.27 and v.28, update XCCDF for other versions * Enabled 1.29 * Update img/app/chart versions for stigatron --------- Signed-off-by: Adam Martin Co-authored-by: Adam Martin * update airgapped-docs to 0.1.6 (#198) Signed-off-by: Adam Martin * updates for rancher v2.7.15 (#200) Signed-off-by: Adam Martin --------- Signed-off-by: Adam Martin Co-authored-by: Carbide SSF Co-authored-by: Adam Toy --------- Signed-off-by: Adam Martin Co-authored-by: Carbide SSF Co-authored-by: Adam Toy --------- Signed-off-by: Adam Martin Co-authored-by: Carbide SSF Co-authored-by: Adam Toy Co-authored-by: Jacob Blain Christen * bump for rancher 2.8.7 Signed-off-by: Adam Martin * bump for rancher chart whitelabel image Signed-off-by: Adam Martin --------- Signed-off-by: Adam Martin Co-authored-by: Carbide SSF Co-authored-by: Adam Toy Co-authored-by: Jacob Blain Christen