fix: make quay-registry-ca ConfigMap name configurable for partner overlays#546
fix: make quay-registry-ca ConfigMap name configurable for partner overlays#546maorfr wants to merge 4 commits into
Conversation
…erlays Extract the hardcoded 'quay-registry-ca' ConfigMap name into a global variable (quay_registry_ca_configmap_name) in defaults/deployment.yaml. This allows partner overlays to discover the ConfigMap name and understand the requirement to include the 'updateservice-registry' key when replacing image.config.spec.additionalTrustedCA. Changes: - Add quay_registry_ca_configmap_name variable in defaults/deployment.yaml - Replace all hardcoded 'quay-registry-ca' references in trust playbook - Document the updateservice-registry key requirement for partner overlays Related to: gori-project/GoRI#924 Assisted-by: Claude Code <noreply@anthropic.com>
|
Warning Review limit reached
More reviews will be available in 50 minutes and 47 seconds. Learn how PR review limits work. Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file). ⌛ How to resolve this issue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits. 🚦 How do rate limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please see our Fair Usage Limits Policy for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (3)
WalkthroughA new default variable ChangesQuay Registry CA ConfigMap Parameterization
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes Poem
🚥 Pre-merge checks | ✅ 11✅ Passed checks (11 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Add schema definition for the new quay_registry_ca_configmap_name variable to fix JSON schema validation failure. Assisted-by: Claude Code <noreply@anthropic.com>
Make the new variable discoverable and overridable in the example configuration file with clear documentation for partner overlays. Assisted-by: Claude Code <noreply@anthropic.com>
Add schema definition for the new variable to allow it in config/global.yaml. Assisted-by: Claude Code <noreply@anthropic.com>
197f2d1 to
ee71187
Compare
| # Partner overlays that replace image.config.spec.additionalTrustedCA must include the | ||
| # 'updateservice-registry' key from this ConfigMap to prevent UpdateService reconciliation failures. | ||
| # See: https://github.com/gori-project/GoRI/issues/924 | ||
| quay_registry_ca_configmap_name: quay-registry-ca |
There was a problem hiding this comment.
nit: we favor all over the place camel case properties, let's try not to introduce new snake case ones
| ConfigMap name for Quay registry CA certificates used by image.config and UpdateService. | ||
| Partner overlays that replace image.config.spec.additionalTrustedCA must include the | ||
| 'updateservice-registry' key from this ConfigMap to prevent UpdateService reconciliation failures. | ||
| Default: quay-registry-ca. |
There was a problem hiding this comment.
default value is outside of this schema, let's remove this.
| ConfigMap name for Quay registry CA certificates used by image.config and UpdateService. | ||
| Partner overlays that replace image.config.spec.additionalTrustedCA must include the | ||
| 'updateservice-registry' key from this ConfigMap to prevent UpdateService reconciliation failures. | ||
| Default: quay-registry-ca. |
There was a problem hiding this comment.
default value is outside of this schema, let's remove this.
Summary
Extract the hardcoded
quay-registry-caConfigMap name into a global variable to support partner overlays that replaceimage.config.spec.additionalTrustedCA.Changes
quay_registry_ca_configmap_namevariable indefaults/deployment.yaml'quay-registry-ca'references inplaybooks/tasks/trust_quay_registry_ca_for_image_config.yamlupdateservice-registrykey requirement for partner overlaysContext
Partner overlays (e.g., IBM's mirror-registry setup) replace the
image.config.spec.additionalTrustedCAConfigMap to point to their own CA bundle. This breaks UpdateService reconciliation because the operator expects theupdateservice-registrykey to be present in the referenced ConfigMap.By extracting the ConfigMap name to a global variable with inline documentation, partners can:
defaults/deployment.yamlupdateservice-registrykeyconfig/global.yaml)Related Issues
Test Plan
quay-registry-canamemake -f Makefile.ci validateto ensure no linting issues🤖 Generated with Claude Code
Summary by CodeRabbit
Bug Fixes
Documentation