feat(fga): Cluster Admin Email assignment gets part of bootstrap command#555
Open
nbrodnicke wants to merge 1 commit into
Open
feat(fga): Cluster Admin Email assignment gets part of bootstrap command#555nbrodnicke wants to merge 1 commit into
nbrodnicke wants to merge 1 commit into
Conversation
Signed-off-by: Niklas Brodnicke <niklas@codesphere.com>
nbrodnicke
force-pushed
the
niklas/cluster-admin-bootstrap
branch
from
2b48970 to
865f0b3
Compare
OliverTrautvetter
requested changes
Jul 3, 2026
OliverTrautvetter
left a comment
OliverTrautvetter
left a comment
Member
There was a problem hiding this comment.
Some comments and questions 👍
Comment on lines
+40
to
+42
| if err := ensureClusterAdminSecret(context.Background(), opts, cfg); err != nil { | ||
| return fmt.Errorf("failed to set cluster admin email: %w", err) | ||
| } |
Member
There was a problem hiding this comment.
Could we thread a context.Context through installCodespherePlatform instead of using a fixed context.Background()?
Comment on lines
+451
to
+469
| func (b *GCPBootstrapper) validateClusterAdminEmail() error { | ||
| if b.Env.ClusterAdminEmail == "" { | ||
| return nil | ||
| } | ||
|
|
||
| // The email reaches the cluster via the install config, which is only | ||
| // updated when the config is written. | ||
| if !b.Env.WriteConfig { | ||
| return fmt.Errorf("cluster admin email requires write-config to be enabled") | ||
| } | ||
|
|
||
| email, err := clusteradmin.NormalizeEmail(b.Env.ClusterAdminEmail) | ||
| if err != nil { | ||
| return fmt.Errorf("invalid cluster admin email: %w", err) | ||
| } | ||
| b.Env.ClusterAdminEmail = email | ||
|
|
||
| return nil | ||
| } |
Member
There was a problem hiding this comment.
Should we allow the flag without --write-config when --recover-config is also set?
| // codesphere.clusterAdminEmail to the cluster-admin-email secret before the | ||
| // platform is installed, so the auth-service finds it on first start. | ||
| // It is a no-op when the config does not set an email. | ||
| func ensureClusterAdminSecret(ctx context.Context, opts *InstallCodesphereOpts, cfg files.RootConfig) error { |
Member
There was a problem hiding this comment.
This looks like it duplicates the vault-loading and kubeconfig-extraction pattern that already exists in loadVaultData in install_codesphere_dependencies.go
extract a shared helper maybe?
Comment on lines
+106
to
+114
| func ensureNamespace(ctx context.Context, clientset kubernetes.Interface, namespace string) error { | ||
| ns := &corev1.Namespace{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: namespace}, | ||
| } | ||
| if _, err := clientset.CoreV1().Namespaces().Create(ctx, ns, metav1.CreateOptions{}); err != nil && !apierrors.IsAlreadyExists(err) { | ||
| return fmt.Errorf("creating namespace %s: %w", namespace, err) | ||
| } | ||
| return nil | ||
| } |
Member
There was a problem hiding this comment.
We don't wait for the namespace, so the namespace might not be visible yet when secrets.Create is called. Is that a problem?
| // codesphere.clusterAdminEmail to the cluster-admin-email secret before the | ||
| // platform is installed, so the auth-service finds it on first start. | ||
| // It is a no-op when the config does not set an email. | ||
| func ensureClusterAdminSecret(ctx context.Context, opts *InstallCodesphereOpts, cfg files.RootConfig) error { |
Member
There was a problem hiding this comment.
Also this function does a lot of infrastructure stuff. So maybe this function would make more sense in the installer or clusteradmin package and not the cli command layer
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
3 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.
CU-869dz4umw
Cluster admin email as part of bootstrap-gcp
Previously, the cluster admin email was set manually in a separate SSH step after bootstrap. This PR makes it a regular, optional part of the bootstrap and install flow instead.
What changes:
New --cluster-admin-email flag on oms beta bootstrap-gcp (optional, no behavior change when unset).
The email is now stored in the install config (codesphere.clusterAdminEmail) instead of only being set temporarily via SSH — it therefore survives re-runs with --write-config/--recover-config.
oms install codesphere automatically creates the cluster-admin-email secret before the platform phase (auth-service) starts — no manual extra step, no service restart needed.
Reuses the existing add-cluster-admin logic instead of duplicating it.
Why: So integration tests (and production bootstraps) get the cluster admin set consistently and reproducibly from the start, instead of relying on a fragile, separate SSH step in the CI workflow.