Skip to content

Update RKE2 CIS profile and add backupstore network policy#2966

Merged
yangchiu merged 2 commits into
longhorn:masterfrom
roger-ryao:add-backupstore-networkpolicy-and-update-cis-profile
Dec 26, 2025
Merged

Update RKE2 CIS profile and add backupstore network policy#2966
yangchiu merged 2 commits into
longhorn:masterfrom
roger-ryao:add-backupstore-networkpolicy-and-update-cis-profile

Conversation

@roger-ryao

Copy link
Copy Markdown
Contributor

Which issue(s) this PR fixes:

  • Add install_backupstores_networkpolicy function to install backupstore network policy
  • Apply backupstore network policy in pipeline setup scripts (e2e, helm, rancher, storage_network)
  • Update RKE2 CIS profile from 'cis-1.23' to 'cis' for latest CIS benchmark support

longhorn/longhorn#11672

What this PR does / why we need it:

Special notes for your reviewer:

Hi @yangchiu
Following up on our discussion last week, I've applied the specific cluster configuration (No CIS profile + Network Policy enabled) to the general regression tests.
Could you please review the changes?

Additional documentation or context

@roger-ryao
roger-ryao requested a review from yangchiu December 23, 2025 08:14
@roger-ryao roger-ryao self-assigned this Dec 23, 2025
@roger-ryao
roger-ryao requested a review from a team as a code owner December 23, 2025 08:14
@roger-ryao
roger-ryao force-pushed the add-backupstore-networkpolicy-and-update-cis-profile branch 3 times, most recently from 15307df to 129c85e Compare December 23, 2025 09:56
useradd -r -c "etcd user" -s /sbin/nologin -M etcd -U
cat << EOF >> /etc/rancher/rke2/config.yaml
profile: "cis-1.23"
profile: "cis"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also enable CIS hardening in K3S?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also enable CIS hardening in K3S?

Theoretically, yes. However, my previous survey showed that K3s CIS hardening takes much more time to prepare and test. So, I plan to finish the RKE2 part first. I will look into how to implement it for K3s after the v1.11.0 release.

cc @derekbit

@roger-ryao
roger-ryao requested review from a team and yangchiu December 26, 2025 02:02
- Add install_backupstores_networkpolicy function to install backupstore network policy
- Apply backupstore network policy in pipeline setup scripts (regression, e2e, helm, rancher, storage_network)
- Update RKE2 CIS profile from 'cis-1.23' to 'cis' for latest CIS benchmark support

longhorn/longhorn#11672

Signed-off-by: Roger Yao <roger.yao@suse.com>
@roger-ryao
roger-ryao force-pushed the add-backupstore-networkpolicy-and-update-cis-profile branch from 129c85e to 33f42f8 Compare December 26, 2025 10:38
@yangchiu
yangchiu merged commit 39bae66 into longhorn:master Dec 26, 2025
5 of 6 checks passed
@roger-ryao
roger-ryao deleted the add-backupstore-networkpolicy-and-update-cis-profile branch June 28, 2026 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants