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

📖 Document MachinePool feature flag promotion #10371

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

nrb
Copy link
Contributor

@nrb nrb commented Apr 3, 2024

Signed-off-by: Nolan Brubaker nolan@nbrubaker.com

What this PR does / why we need it:

#10141 enabled the MachinePool feature flag by default, and this change will cause errors if providers do not update their code to reflect the change.

/area documentation

@k8s-ci-robot k8s-ci-robot added area/documentation Issues or PRs related to documentation cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 3, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 3, 2024
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Thanks
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6e7c76969b544fe23e73d8ef2a95796b2e4084a4

@damdo
Copy link
Member

damdo commented Apr 4, 2024

cc.
@oscr @elmiko (docs)
@willie-yao @sbueringer (worked on this doc before)

@chrischdi
Copy link
Member

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@chrischdi: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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.

Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

Can we get more clarity maybe on the action item for a provider maintainer/contributor?

Maybe we can link an issue or pr of a provider if available with more details about the issue?

@damdo
Copy link
Member

damdo commented Apr 4, 2024

@chrischdi There is an example of this in the open PR we have on the CAPA Provider:
kubernetes-sigs/cluster-api-provider-aws#4897

Here is the diff of the change

diff --git a/feature/feature.go b/feature/feature.go
index 916aebb640..061e4edd57 100644
--- a/feature/feature.go
+++ b/feature/feature.go
@@ -101,7 +101,7 @@ var defaultCAPAFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
 	EKSAllowAddRoles:              {Default: false, PreRelease: featuregate.Beta},
 	EKSFargate:                    {Default: false, PreRelease: featuregate.Alpha},
 	EventBridgeInstanceState:      {Default: false, PreRelease: featuregate.Alpha},
-	MachinePool:                   {Default: false, PreRelease: featuregate.Alpha},
+	MachinePool:                   {Default: true, PreRelease: featuregate.Beta},
 	AutoControllerIdentityCreator: {Default: true, PreRelease: featuregate.Alpha},
 	BootstrapFormatIgnition:       {Default: false, PreRelease: featuregate.Alpha},
 	ExternalResourceGC:            {Default: false, PreRelease: featuregate.Alpha},

@chrischdi
Copy link
Member

chrischdi commented Apr 4, 2024

@damdo
Copy link
Member

damdo commented Apr 4, 2024

Sounds good @chrischdi.
cc. @nrb

Signed-off-by: Nolan Brubaker <nolan@nbrubaker.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2024
@k8s-ci-robot k8s-ci-robot requested a review from damdo April 4, 2024 13:42
@nrb
Copy link
Contributor Author

nrb commented Apr 4, 2024

@chrischdi @fabriziopandini Incorporated your suggestions with the latest push.

@sbueringer
Copy link
Member

Thx! Also thx for bringing this up!

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 4, 2024
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 4, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: ffc7166c7a80c03b15c3f7aae95ddb42dde6705d

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, sbueringer

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

@fabriziopandini
Copy link
Member

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@fabriziopandini: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.7

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.

@fabriziopandini
Copy link
Member

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot

@fabriziopandini: once the present PR merges, I will cherry-pick it on top of release-1.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.6

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.

@fabriziopandini
Copy link
Member

Ooops, cherry-pick release-1.6 is not necessary, I will close it

@k8s-ci-robot k8s-ci-robot merged commit 4176cd0 into kubernetes-sigs:main Apr 4, 2024
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Apr 4, 2024
@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #10381

In response to this:

/cherry-pick release-1.7

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.

@k8s-infra-cherrypick-robot

@fabriziopandini: #10371 failed to apply on top of branch "release-1.6":

Applying: Document MachinePool feature flag promotion
Using index info to reconstruct a base tree...
A	docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md deleted in HEAD and modified in Document MachinePool feature flag promotion. Version Document MachinePool feature flag promotion of docs/book/src/developer/providers/migrations/v1.6-to-v1.7.md left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Document MachinePool feature flag promotion
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.6

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. area/documentation Issues or PRs related to documentation 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants