Skip to content

feat(managedcontrolplane): user-friendly secret name for MCP access #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2025
+14 −1
Merged

feat(managedcontrolplane): user-friendly secret name for MCP access #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion internal/controllers/managedcontrolplane/access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func (r *ManagedControlPlaneReconciler) syncAccessSecrets(ctx context.Context, m
return false, rerr
}
mcpSecret := &corev1.Secret{}
mcpSecret.Name = ctrlutils.NameHashSHAKE128Base32(mcp.Name, providerName)
mcpSecret.Name = secretName(providerName, mcp.Name)
mcpSecret.Namespace = mcp.Namespace
if _, err := controllerutil.CreateOrUpdate(ctx, r.OnboardingCluster.Client(), mcpSecret, func() error {
mcpSecret.Data = arSecret.Data
Expand Down Expand Up @@ -397,3 +397,14 @@ func (r *ManagedControlPlaneReconciler) syncAccessSecrets(ctx context.Context, m

return allAccessReady, nil
}

// secretName generates the following secret name format: '<provider-name>.<mcp-name>.kubeconfig'.
// The '<provider-name>.<mcp-name>' part will be truncated and partially replaced with a hash if the
// resulting name exceeds the Kubernetes name length limit of 63 characters.
func secretName(providerName string, mcpName string) string {
// adjust oidc and token prefix in provider name to conform RFC 1123
providerPrefix := strings.ReplaceAll(providerName, "_", "-")
compositeName := fmt.Sprintf("%s.%s", providerPrefix, mcpName)
suffix := ".kubeconfig"
return fmt.Sprintf("%s%s", ctrlutils.ShortenToXCharactersUnsafe(compositeName, ctrlutils.K8sMaxNameLength-len(suffix)), suffix)
}
2 changes: 2 additions & 0 deletions internal/controllers/managedcontrolplane/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ var _ = Describe("ManagedControlPlane Controller", func() {
sec.SetNamespace(mcp.Namespace)
Expect(env.Client(onboarding).Get(env.Ctx, client.ObjectKeyFromObject(sec), sec)).To(Succeed())
Expect(sec.Data).To(HaveKeyWithValue(clustersv1alpha1.SecretKeyKubeconfig, []byte(providerName)))
providerPrefix := strings.ReplaceAll(providerName, "_", "-")
Expect(sec.Name).To(Equal(strings.Join([]string{providerPrefix, mcp.Name, "kubeconfig"}, ".")))
}

By("=== UPDATE ===")
Expand Down