feat(resourcemanager): Unify organization model and onboarding gate#675
Open
mattdjenkinson wants to merge 14 commits into
Open
feat(resourcemanager): Unify organization model and onboarding gate#675mattdjenkinson wants to merge 14 commits into
mattdjenkinson wants to merge 14 commits into
Conversation
Collapse Personal/Standard into a single org with contactInfo and an OnboardingComplete status condition reconciled from billing readiness.
🤖 Automatically added newlines to 6 file(s) Co-Authored-By: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
The onboarding controller imports go.miloapis.com/billing but go.sum was not updated when the module was added, breaking CI builds.
The info and created-timestamp generators were accidentally merged into one YAML object, duplicating resource/families keys and failing kustomize validation.
Remove leftover spec.type from e2e org fixtures, drop empty spec from grant-creation assert, and treat missing BillingAccount API as no billing account in test clusters without billing CRDs.
The organization controller registered a BillingAccount informer even in test clusters without the billing API, contributing to controller-manager restarts and webhook connection refused failures during parallel chainsaw runs. Also extend owner-protection namespace cleanup timeout for CI load.
mattdjenkinson
requested review from
JoseSzycho,
kevwilliams,
savme and
scotwells
5 tasks
Contributor
|
The tight coupling this introduces between the billing service and milo's core system seems rigid. Wonder if we can consider a more dynamic model where services can register onboarding gates with an organization that they're responsible for providing status for? |
Contributor
Author
|
@scotwells we could do something like introduce an |
…feature flag Keep deprecated spec.type in the schema and switch webhook, onboarding, and membership behavior based on the feature gate so environments can roll out gradually without divergent CRD bundles.
Fix compile error in organization_defaults.go so webhook tests and CI builds succeed again.
The deployment passes --feature-gates=$(FEATURE_GATES) but the controller-manager command did not expose the flag, causing the pod to crash on startup during test-environment-validation.
E2E tests run with UnifiedOrganizations disabled, so organization creates must include spec.type until the test environment enables the unified gate.
🤖 Automatically added newlines to 21 file(s) Co-Authored-By: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Contributor
|
🤖 I automatically added missing newlines at the end of 21 file(s) in this PR. All files should now end with a newline character as per coding standards. |
scotwells
approved these changes
Jun 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Personal and Standard org types split the same resource into two code paths and locked people into workspaces they could not grow out of. This change removes
spec.type, adds org-levelcontactInfo, and introduces a single onboarding gate the API can enforce.Portal clients create orgs with
generateName: org-and a display name only. The mutating webhook defaults that prefix for non-admin callers; the validating webhook rejects user-chosen slugs. An org is onboarding-complete when contact info (email and name), a billing account in the org namespace, andDefaultPaymentMethodReadyon that account are all present. The organization controller writes that outcome tostatus.conditions[OnboardingComplete].Related enhancement: datum-cloud/enhancements#770. Portal UI work is tracked separately and is not in this PR.
Supersedes #673 (reopened after branch restore).
Test plan
go build ./...go test ./internal/controllers/resourcemanager/... ./internal/webhooks/resourcemanager/...spec.typegenerateName: org-assigns an opaque name and owner membershipOnboardingCompleteflips to True when contact info and billing payment method are readyBreaking changes
Organization.spec.typeis removed. Clients must stop sending or reading it.OrganizationMembership.status.organization.typeis removed;contactEmailis cached instead.metadata.generateNamewith prefixorg-.Notes for reviewers
go.miloapis.com/billingfor typed reads in the onboarding reconciler.docs/runbooks/unified-organizations-migration.md.Related to #636