Skip to content

fix: aggregate sources from multiple InitTargets for the same WorkspaceType#20

Open
ifdotpy wants to merge 1 commit intokcp-dev:mainfrom
ifdotpy:fix/multi-inittarget-race
Open

fix: aggregate sources from multiple InitTargets for the same WorkspaceType#20
ifdotpy wants to merge 1 commit intokcp-dev:mainfrom
ifdotpy:fix/multi-inittarget-race

Conversation

@ifdotpy
Copy link
Copy Markdown

@ifdotpy ifdotpy commented Apr 2, 2026

Summary

When multiple InitTargets reference the same WorkspaceType, the targetcontroller now creates a single controller per WorkspaceType instead of one per InitTarget. Sources from all matching InitTargets are aggregated into a single initialization pass, and the initializer is only removed after all sources from all targets are applied.

Problem

Each InitTarget spawned its own controller with the same initializer name (derived from WorkspaceType via InitializerForType). The first controller to finish would remove the initializer, causing subsequent controllers to skip their sources entirely (reconciler.go line 64).

Changes

  • internal/controller/targetcontroller/controller.go: Key controllers by WorkspaceType reference instead of InitTarget UID. Track which InitTarget names belong to each WorkspaceType. Only stop a controller when the last InitTarget for that WorkspaceType is deleted.
  • internal/controller/initcontroller/controller.go: InitTargetProvider returns []*InitTarget instead of a single target.
  • internal/controller/initcontroller/reconciler.go: Iterate sources from all returned InitTargets before removing the initializer.

Backward compatibility

Fully backward compatible. A single InitTarget per WorkspaceType continues to work unchanged.

Fixes #17

Fix race condition where multiple InitTargets for the same WorkspaceType could cause some templates to be silently skipped.

…ceType

When multiple InitTargets reference the same WorkspaceType, the
targetcontroller now creates a single controller per WorkspaceType
instead of one per InitTarget. Sources from all matching InitTargets
are aggregated into a single initialization pass, and the initializer
is only removed after all sources from all targets are applied.

Previously, each InitTarget spawned its own controller with the same
initializer name (derived from WorkspaceType). The first controller
to finish would remove the initializer, causing subsequent controllers
to skip their sources entirely.

Fixes kcp-dev#17

Signed-off-by: Igor Fominykh <ifdotpy@gmail.com>
@kcp-ci-bot kcp-ci-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has signed the DCO. labels Apr 2, 2026
@kcp-ci-bot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign xrstf for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@kcp-ci-bot kcp-ci-bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 2, 2026
@kcp-ci-bot
Copy link
Copy Markdown
Contributor

Hi @ifdotpy. Thanks for your PR.

I'm waiting for a kcp-dev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@kcp-ci-bot kcp-ci-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Multiple InitTargets for the same WorkspaceType: race condition causes skipped templates

2 participants