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

Release 1.16 #82557

Closed

Conversation

@joshmsamuels
Copy link
Contributor

commented Sep 11, 2019

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
This PR prevents server-side apply from accepting managed fields. It is a duplicate of an earlier PR that I made for 1.16. See the other PR here: #81453
Which issue(s) this PR fixes:

Special notes for your reviewer:
duplicate of #81453

Does this PR introduce a user-facing change?:


Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Sep 11, 2019

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

@joshmsamuels: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

@joshmsamuels: This cherry pick PR is for a release branch and has not yet been approved by the Patch Release Team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, please ping the kubernetes/patch-release-team in a comment, after it has been approved by the relevant OWNERS.
For details on the patch release process and schedule, see the Patch Releases page.

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-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

Hi @joshmsamuels. Thanks for your PR.

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

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-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: joshmsamuels
To complete the pull request process, please assign jennybuckley
You can assign the PR to them by writing /assign @jennybuckley in a comment when ready.

The full list of commands accepted by this bot can be found 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

@joshmsamuels

This comment has been minimized.

Copy link
Contributor Author

commented Sep 11, 2019

@apelisse should the KEP also be cherry-picked to 1.15 1.16? also note there are minor changes from #81453 in the diff because the code was older in the 1.16 release branch (at least thats my assumption)

@liggitt

This comment has been minimized.

Copy link
Member

commented Sep 11, 2019

Please use the hack/cherry_pick_pull.sh script to cherry pick 81453 if possible. There should be no appreciable differences in the 1.16 branch and master since master just opened today.

@liggitt

This comment has been minimized.

Copy link
Member

commented Sep 11, 2019

@apelisse should the KEP also be cherry-picked to 1.15?

No, we only need this picked to 1.16

return nil, fmt.Errorf("couldn't get accessor: %v", err)
}
missingManagedFields := (len(accessor.GetManagedFields()) == 0)

This comment has been minimized.

Copy link
@liggitt

liggitt Sep 11, 2019

Member

dropping this isn't correct (it doesn't compile/pass unit tests). see if the hack script for creating the cherry pick comes up with a diff that matches the original PR better

This comment has been minimized.

Copy link
@joshmsamuels

joshmsamuels Sep 11, 2019

Author Contributor

@liggitt The hack script modified much more than required for some reason #82581

This comment has been minimized.

Copy link
@liggitt

liggitt Sep 11, 2019

Member

strange, it seemed to work for me... opened #82582

@joshmsamuels joshmsamuels deleted the joshmsamuels:release-1.16 branch Sep 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.