Skip to content

馃悰 Fix ParseSecretName round-trip for purposes containing hyphens - #14040

Open
kiarashazarnia wants to merge 1 commit into
kubernetes-sigs:mainfrom
kiarashazarnia:fix/secret-parsename-roundtrip
Open

馃悰 Fix ParseSecretName round-trip for purposes containing hyphens#14040
kiarashazarnia wants to merge 1 commit into
kubernetes-sigs:mainfrom
kiarashazarnia:fix/secret-parsename-roundtrip

Conversation

@kiarashazarnia

Copy link
Copy Markdown

/kind bug
/area bootstrap
/sig cluster-lifecycle

What this PR does / why we need it:

Some Cluster API secrets were being silently dropped during clusterctl move, causing the move graph to miss real resources. The cause is ParseSecretName failing on the APIServerEtcdClient purpose because it splits the secret name at the last hyphen and the trailing segment is not a valid purpose.

The fix replaces the LastIndex split with suffix-based matching against allSecretPurposes, mirroring HasPurposeSuffix in consts.go.

Which issue(s) this PR fixes:

Suggested Release Note"

Fix `ParseSecretName` round-trip for purposes containing hyphens by using suffix-based matching instead of `LastIndex` splitting.

Reviewer notes:

  • ParseSecretName is also called from util/kubeconfig/kubeconfig.go:193, but that path only handles Kubeconfig secrets, so it never hit the bug.
  • Required test also added for future regressions :) Before the fix, TestParseSecretName_RoundTrip's two APIServerEtcdClient cases ("cluster-apiserver-etcd-client" and "my-cluster-apiserver-etcd-client") returned an error because the last-hyphen split extracted "client" instead of "apiserver-etcd-client". After the fix, both parse correctly as (cluster_name, APIServerEtcdClient).

Replace LastIndex-based split with suffix matching against
allSecretPurposes, so that APIServerEtcdClient ("apiserver-etcd-client")
round-trips correctly with Name/ParseSecretName.

Add TestParseSecretName_RoundTrip covering all purpose values.
@kubernetes-prow kubernetes-prow Bot added kind/bug Categorizes issue or PR as related to a bug. area/bootstrap Issues or PRs related to bootstrap providers sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Aug 9, 2026
@kubernetes-prow

Copy link
Copy Markdown
Contributor

Welcome @kiarashazarnia!

It looks like this is your first PR to kubernetes-sigs/cluster-api 馃帀. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 馃槂

@kubernetes-prow kubernetes-prow Bot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 9, 2026
@kubernetes-prow

Copy link
Copy Markdown
Contributor

Hi @kiarashazarnia. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

@kubernetes-prow

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 justinsb 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

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

Labels

area/bootstrap Issues or PRs related to bootstrap providers cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant