Skip to content

cherry pick #100341 #98576 #95836 on 1.19 to enable SSA with APIService#100713

Merged
k8s-ci-robot merged 5 commits intokubernetes:release-1.19from
kevindelgado:automated-cherry-pick-of-#100341-#98576-upstream-release-1.19
Apr 8, 2021
Merged

cherry pick #100341 #98576 #95836 on 1.19 to enable SSA with APIService#100713
k8s-ci-robot merged 5 commits intokubernetes:release-1.19from
kevindelgado:automated-cherry-pick-of-#100341-#98576-upstream-release-1.19

Conversation

@kevindelgado
Copy link
Copy Markdown
Contributor

@kevindelgado kevindelgado commented Mar 31, 2021 •
edited
Loading

Cherry pick of #100341 #98576 #95836 on release-1.19.

#100341: Add ability to skip OpenAPI handler installation

#98576: Declare TCP default for service port protocol

  • The commit declaring TCP as the default protocol has been removed because it uses features implemented in Add defaults openapi #96480 that do not exist in 1.19
  • A line has been added to set the protocol of the service object in the etcd data stub in order to account for SSA's inability to set a default protocol in 1.19

#95836: Add yaml util to unmarshal numbers into int/float

fixes #99046

Fixes using server-side apply with APIService resources

@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Mar 31, 2021
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 31, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 31, 2021

Hi @kevindelgado. 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.

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

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/test kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Mar 31, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label Mar 31, 2021
@kevindelgado
Copy link
Copy Markdown
Contributor Author

kevindelgado commented Mar 31, 2021

/assign @apelisse
/cc @liggitt

@k8s-ci-robot k8s-ci-robot requested a review from liggitt March 31, 2021 16:08
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Mar 31, 2021
@liggitt
Copy link
Copy Markdown
Member

liggitt commented Mar 31, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 31, 2021
@kevindelgado kevindelgado force-pushed the automated-cherry-pick-of-#100341-#98576-upstream-release-1.19 branch from b23cd20 to 3bc2faf Compare April 5, 2021 17:17
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 5, 2021
@jpbetz
Copy link
Copy Markdown
Contributor

jpbetz commented Apr 6, 2021

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 6, 2021
@kevindelgado kevindelgado force-pushed the automated-cherry-pick-of-#100341-#98576-upstream-release-1.19 branch from 3bc2faf to e366283 Compare April 7, 2021 00:07
@kevindelgado kevindelgado changed the title Automated cherry pick of #100341: Add ability to skip OpenAPI handler installation #98576: Declare TCP default for service port protocol cherry pick #100341 #98576 #95836 on 1.18 to enable SSA with APIService Apr 7, 2021
@kevindelgado kevindelgado changed the title cherry pick #100341 #98576 #95836 on 1.18 to enable SSA with APIService cherry pick #100341 #98576 #95836 on 1.19 to enable SSA with APIService Apr 7, 2021
@kevindelgado
Copy link
Copy Markdown
Contributor Author

kevindelgado commented Apr 7, 2021

/retest

@kevindelgado
Copy link
Copy Markdown
Contributor Author

kevindelgado commented Apr 7, 2021

CI passes, description updated PTAL @liggitt

@liggitt
Copy link
Copy Markdown
Member

liggitt commented Apr 7, 2021

/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 7, 2021
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Apr 7, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevindelgado, liggitt

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

The pull request process is described 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

@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 7, 2021
@kevindelgado
Copy link
Copy Markdown
Contributor Author

kevindelgado commented Apr 7, 2021

ready for cherry-pick review, ping @kubernetes/release-engineering

@feiskyer feiskyer added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Apr 8, 2021
@k8s-ci-robot k8s-ci-robot merged commit 64c9b22 into kubernetes:release-1.19 Apr 8, 2021
@kevindelgado kevindelgado mentioned this pull request Apr 9, 2021
Closed
@liggitt liggitt mentioned this pull request Jun 23, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cheftako cheftako Awaiting requested review from cheftako

@deads2k deads2k Awaiting requested review from deads2k

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@liggitt liggitt

@apelisse apelisse

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/test cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.

Projects

None yet

Milestone

v1.19

Development

Successfully merging this pull request may close these issues.

7 participants

@kevindelgado @k8s-ci-robot @liggitt @jpbetz @feiskyer @apelisse @nodo