Skip to content
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.

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

🐛 Add name hashing for long MS and KCP names #7711

Merged
merged 1 commit into from
Dec 13, 2022

Conversation

killianmuldoon
Copy link
Contributor

@killianmuldoon killianmuldoon commented Dec 8, 2022

Signed-off-by: killianmuldoon kmuldoon@vmware.com

Add a function which hashes the MachineSet and KubeadmControlPlane name for use in a label if the name is too long to be used as a normal label value.

Part of #7710

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 8, 2022
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 8, 2022
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on getting this change in, seems a fine addition!

internal/controllers/machineset/msutil/names.go Outdated Show resolved Hide resolved
@killianmuldoon killianmuldoon force-pushed the pr-fix-ms-naming branch 2 times, most recently from 840523c to 068c239 Compare December 12, 2022 12:18
@killianmuldoon killianmuldoon changed the title 🐛 Add name hashing for long MS names 🐛 Add name hashing for long MS and KCP names Dec 12, 2022
@killianmuldoon killianmuldoon force-pushed the pr-fix-ms-naming branch 7 times, most recently from 782744d to 8160de6 Compare December 12, 2022 13:14
@killianmuldoon
Copy link
Contributor Author

/test pull-cluster-api-e2e-full-main

@killianmuldoon killianmuldoon force-pushed the pr-fix-ms-naming branch 3 times, most recently from 31ad451 to 3fea53d Compare December 12, 2022 17:05
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
@ykakarap
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2022
@fabriziopandini
Copy link
Member

/lgtm

@fabriziopandini
Copy link
Member

Great work!
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2022
@k8s-ci-robot k8s-ci-robot merged commit a9b19a6 into kubernetes-sigs:main Dec 13, 2022
@killianmuldoon
Copy link
Contributor Author

/cherry-pick release-1.3

@k8s-ci-robot k8s-ci-robot added this to the v1.4 milestone Dec 13, 2022
@k8s-infra-cherrypick-robot

@killianmuldoon: #7711 failed to apply on top of branch "release-1.3":

Applying: Add name hashing for long MS names
Using index info to reconstruct a base tree...
M	api/v1beta1/machine_types.go
M	api/v1beta1/machineset_webhook.go
M	controlplane/kubeadm/internal/cluster_labels.go
M	controlplane/kubeadm/internal/controllers/controller.go
M	internal/controllers/machineset/machineset_controller.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/machineset/machineset_controller.go
CONFLICT (content): Merge conflict in internal/controllers/machineset/machineset_controller.go
Auto-merging controlplane/kubeadm/internal/controllers/controller.go
Auto-merging controlplane/kubeadm/internal/cluster_labels.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/cluster_labels.go
Auto-merging api/v1beta1/machineset_webhook.go
CONFLICT (content): Merge conflict in api/v1beta1/machineset_webhook.go
Auto-merging api/v1beta1/machine_types.go
CONFLICT (content): Merge conflict in api/v1beta1/machine_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add name hashing for long MS names
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.3

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/test-infra repository.

1 similar comment
@k8s-infra-cherrypick-robot

@killianmuldoon: #7711 failed to apply on top of branch "release-1.3":

Applying: Add name hashing for long MS names
Using index info to reconstruct a base tree...
M	api/v1beta1/machine_types.go
M	api/v1beta1/machineset_webhook.go
M	controlplane/kubeadm/internal/cluster_labels.go
M	controlplane/kubeadm/internal/controllers/controller.go
M	internal/controllers/machineset/machineset_controller.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/machineset/machineset_controller.go
CONFLICT (content): Merge conflict in internal/controllers/machineset/machineset_controller.go
Auto-merging controlplane/kubeadm/internal/controllers/controller.go
Auto-merging controlplane/kubeadm/internal/cluster_labels.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/cluster_labels.go
Auto-merging api/v1beta1/machineset_webhook.go
CONFLICT (content): Merge conflict in api/v1beta1/machineset_webhook.go
Auto-merging api/v1beta1/machine_types.go
CONFLICT (content): Merge conflict in api/v1beta1/machine_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add name hashing for long MS names
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.3

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

None yet

7 participants