Skip to content

Add dptp_collection and remove collection from dockerconfigs#78405

Open
psalajova wants to merge 1 commit intoopenshift:mainfrom
psalajova:update-gsm-config
Open

Add dptp_collection and remove collection from dockerconfigs#78405
psalajova wants to merge 1 commit intoopenshift:mainfrom
psalajova:update-gsm-config

Conversation

@psalajova
Copy link
Copy Markdown
Contributor

@psalajova psalajova commented Apr 27, 2026

Needs to be merged after openshift/ci-tools#5136 is merged.

Summary by CodeRabbit

  • Chores
    • Centralized Docker registry configuration by introducing a new top-level collection setting.
    • Removed explicit per-registry collection entries across deployment bundles.
    • Preserved individual registry fields (auth, optional email, group, registry URL) while reducing repetition.

@psalajova
Copy link
Copy Markdown
Contributor Author

/hold

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Apr 27, 2026

Walkthrough

A top-level dptp_collection: test-platform-infra key is added to the GSM configuration. Individual collection: test-platform-infra fields are removed from dockerconfig.registries entries across many bundle definitions, consolidating the registry collection to the new top-level key.

Changes

Cohort / File(s) Summary
GSM Configuration Consolidation
core-services/ci-secret-bootstrap/gsm-config.yaml
Added top-level dptp_collection: test-platform-infra; removed per-registry collection: test-platform-infra entries from many dockerconfig.registries bundle entries (build01–build12, core-ci, app.ci, vsphere02, pusher/pull credential bundles), leaving other per-registry fields intact.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR modifies only YAML configuration file, not Ginkgo test code, so check is not applicable.
Test Structure And Quality ✅ Passed Custom check for Ginkgo test code quality is not applicable; PR only modifies YAML configuration file with no test-related changes.
Microshift Test Compatibility ✅ Passed PR modifies only gsm-config.yaml configuration file with no new Ginkgo e2e tests, making it not applicable to MicroShift Test Compatibility check.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The SNO test compatibility check is not applicable to this PR as it only modifies a configuration file and contains no new Ginkgo e2e tests.
Topology-Aware Scheduling Compatibility ✅ Passed Pull request modifies only gsm-config.yaml, a configuration file for Secret Bootstrap service with no Kubernetes deployment manifests, operator code, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The OTE Binary Stdout Contract check is not applicable to this PR. The PR only modifies YAML configuration files for secret management, which are declarative and contain no executable code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR modifies only gsm-config.yaml, a configuration file, and does not introduce any new Ginkgo e2e tests.
Title check ✅ Passed The title accurately describes the main changes: adding dptp_collection at the top level and removing collection fields from dockerconfig registry entries.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 27, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 27, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: psalajova

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 27, 2026
@openshift-ci openshift-ci Bot requested review from droslean and hector-vido April 27, 2026 12:35
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 27, 2026
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@core-services/ci-secret-bootstrap/gsm-config.yaml`:
- Line 67: Confirm the upstream change and gate this config update: verify the
correct openshift/ci-tools PR number (the comment suspects `#5136` is wrong) that
introduces the top-level gsm_dptp_collection field and remove per-registry
collection usage only after that PR is merged; ensure the ci-secret-bootstrap
binary supports falling back to gsm_dptp_collection (or update
ci-secret-bootstrap to read gsm_dptp_collection when dockerconfig.registries
entries lack collection) and only apply removal of per-registry collection
values in gsm-config.yaml once the binary and upstream PR are confirmed.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: d8ec6dc9-33c5-42d1-a5d5-8b7cfe6be91b

📥 Commits

Reviewing files that changed from the base of the PR and between 2dffe71 and 2c2415e.

📒 Files selected for processing (1)
  • core-services/ci-secret-bootstrap/gsm-config.yaml

Comment thread core-services/ci-secret-bootstrap/gsm-config.yaml Outdated
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@psalajova: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@psalajova psalajova changed the title Add gsm_dptp_collection and remove collection from dockerconfigs Add dptp_collection and remove collection from dockerconfigs Apr 30, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 30, 2026

@psalajova: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/ci-secret-bootstrap-config-validation d5b9fa8 link true /test ci-secret-bootstrap-config-validation

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant