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 <[email protected]>
Co-authored-by: Adam Martin <[email protected]>

* update airgapped-docs to 0.1.6 (#198)

Signed-off-by: Adam Martin <[email protected]>

* updates for rancher v2.7.15 (#200)

Signed-off-by: Adam Martin <[email protected]>

* Rancher 2.8.6 (#202)

* updates for rancher v2.8.6

Signed-off-by: Adam Martin <[email protected]>

* readme update

Signed-off-by: Adam Martin <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>

* 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 <[email protected]>
Co-authored-by: Adam Martin <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>
Co-authored-by: Carbide SSF <[email protected]>
Co-authored-by: Adam Toy <[email protected]>

* 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 <[email protected]>
Co-authored-by: Adam Martin <[email protected]>

* update airgapped-docs to 0.1.6 (#198)

Signed-off-by: Adam Martin <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>
Co-authored-by: Carbide SSF <[email protected]>
Co-authored-by: Adam Toy <[email protected]>

* 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 <[email protected]>
Co-authored-by: Adam Martin <[email protected]>

* update airgapped-docs to 0.1.6 (#198)

Signed-off-by: Adam Martin <[email protected]>

* updates for rancher v2.7.15 (#200)

Signed-off-by: Adam Martin <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>
Co-authored-by: Carbide SSF <[email protected]>
Co-authored-by: Adam Toy <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>
Co-authored-by: Carbide SSF <[email protected]>
Co-authored-by: Adam Toy <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>
Co-authored-by: Carbide SSF <[email protected]>
Co-authored-by: Adam Toy <[email protected]>
Co-authored-by: Jacob Blain Christen <[email protected]>

* bump for rancher 2.8.7

Signed-off-by: Adam Martin <[email protected]>

* bump for rancher chart whitelabel image

Signed-off-by: Adam Martin <[email protected]>

---------

Signed-off-by: Adam Martin <[email protected]>
Co-authored-by: Carbide SSF <[email protected]>
Co-authored-by: Adam Toy <[email protected]>
Co-authored-by: Jacob Blain Christen <[email protected]>