Skip to content

Conversation

tomklapiscak
Copy link
Contributor

@tomklapiscak tomklapiscak commented Apr 15, 2025

https://jsw.ibm.com/browse/MASCORE-6361

This PR includes 2 tactical fixes for the rollout of gitops:6.0.0 to address rate limit problems encountered in the suite-dns Job

single edge certificate via SAAS_MODE hostname template

override_dns_cis_flags_to_false

  • Add mechanism to ensure dns.cis update_dns_entries, override_edge_certs and delete_wildcards are set to false during >=6.0.0 rollout. This is because >=6.0.0 (necessarily) forces a re-run of the suite-dns Job for all existing MAS instances. If these flags are true when this happens, a new edge cert would be ordered for every MAS instance (which would easily hit the 50 certs / week LE limit, and each run of the suite-dns job would make ~60 unnecessary calls to the CIS HTTP API (which would cause us to repeatedly hit the per IP 100 req / minute rate limit imposed by CIS). This achieved by the introduction of a new override_dns_cis_flags_to_false flag on the root manfiest. When true the dns.cis flags will be forced to false, regardless of envionment configuration. The intention is to actually update these values in the env config post 6.0.0, at which point the override_dns_cis_flags_to_false can (and should) be removed from the root app manifest.

Also pulls in a change from ansible-devops that removes an unnecessary PATCH call made to CIS API that was adding 70 calls each time the suite-dns job ran. See ibm-mas/ansible-devops#1700

Testing

SAAS_MODE: True

Set on suite-dns job:
image

SaaS-specific edge cert hostnames loaded:
image

override_dns_cis_flags_to_false flag

No flag set on root manifest:
image
dns.cis flags set according to env config on syncjobs app:
image

flag set to false on root manifest:
image
dns.cis flags set according to env config on syncjobs app:
image

flag set to true on root manifest:
image
dns.cis flags ignore env config and are forced to false on syncjobs app:
image

@tomklapiscak tomklapiscak changed the title [patch] enable tactical SAAS_MODE fix in suite-dns role [patch] enable tactical SAAS_MODE and override_dns_cis_flags_to_false fixes in suite-dns role Apr 17, 2025
@tomklapiscak tomklapiscak requested a review from rbinns April 17, 2025 11:09
rbinns
rbinns previously approved these changes Apr 17, 2025
Copy link
Contributor

@rbinns rbinns left a comment

Choose a reason for hiding this comment

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

Reviewed

@tomklapiscak tomklapiscak changed the base branch from mascore5637 to main April 17, 2025 13:29
@tomklapiscak tomklapiscak dismissed rbinns’s stale review April 17, 2025 13:29

The base branch was changed.

@tomklapiscak tomklapiscak requested a review from rbinns April 17, 2025 13:33
Copy link
Contributor

@rbinns rbinns left a comment

Choose a reason for hiding this comment

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

Previously reviewed - this is just rebasing. Reviewed the changes.

@tomklapiscak tomklapiscak merged commit 739ab3d into main Apr 17, 2025
2 checks passed
@tomklapiscak tomklapiscak deleted the mascore6361 branch April 17, 2025 15:32
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