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.

Sign up for GitHub

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

Jump to bottom

Promoting AP&F API to beta #96213

Closed
wants to merge 1 commit into from
Closed

Promoting AP&F API to beta #96213

wants to merge 1 commit into from

Conversation

yue9944882
Copy link
Member 

NONE

NOTE: this pull will rebase onto #94244 after it gets merged

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver 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. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 4, 2020
@yue9944882 yue9944882 force-pushed the apf-beta-api branch 7 times, most recently from e998f62 to aaa0ad1 Compare November 5, 2020 04:24
MikeSpreitzer
MikeSpreitzer reviewed Nov 5, 2020
View reviewed changes
Copy link
Member

@MikeSpreitzer MikeSpreitzer left a comment

Choose a reason for hiding this comment

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

I am not sure exactly what is meant by the remark in the first comment that

NOTE: this pull will rebase onto #94244 after it gets merged

It looks to me like this PR includes #94244.

pkg/api/testing/defaulting_test.go Show resolved Hide resolved
@MikeSpreitzer
Copy link
Member

@MikeSpreitzer

@yue9944882
Copy link
Member Author

yue9944882 commented Nov 5, 2020 •
edited

I am not sure exactly what is meant by the remark in the first comment that
NOTE: this pull will rebase onto #94244 after it gets merged
It looks to me like this PR includes #94244.

@MikeSpreitzer #94244 is getting in soon, so am including it to get rid of conflicts in advance. i will be removing the WIP bit after the other pull is merged

@yue9944882 yue9944882 force-pushed the apf-beta-api branch 4 times, most recently from 07f6499 to 93590c3 Compare November 5, 2020 08:48
@yue9944882
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 12, 2020
@yue9944882 yue9944882 changed the title WIP: Promoting AP&F API to beta Promoting AP&F API to beta Nov 12, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 12, 2020
@yue9944882
Copy link
Member Author

/retest

@yue9944882
Copy link
Member Author

$ git fetch https://github.com/kubernetes/kubernetes.git pull/96213/head
From https://github.com/kubernetes/kubernetes

  • branch refs/pull/96213/head -> FETCH_HEAD
    $ git merge --no-ff 718d6c7
    merge: 718d6c7 - not something we can merge

i cant reproduce the error locally, is there anything wrong with the CI infra?

@fejta-bot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@yue9944882
Copy link
Member Author

/retest

2 similar comments
@yue9944882
Copy link
Member Author

/retest

@yue9944882
Copy link
Member Author

/retest

@adtac
Copy link
Member

adtac commented Nov 12, 2020

I think you might have to rebase on to latest master. CI failures point towards that I think.

@adtac
Copy link
Member

adtac commented Nov 12, 2020

/retest

@ahg-g
Copy link
Member

ahg-g commented Nov 12, 2020

/milestone v1.20

@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Nov 12, 2020
@adtac
Copy link
Member

adtac commented Nov 12, 2020 •
edited

@yue9944882 as @ahg-g pointed out on Slack, could you also please graduate

kubernetes/pkg/features/kube_features.go

Line 810 in f653e6c

genericfeatures.APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha},
and

kubernetes/staging/src/k8s.io/apiserver/pkg/features/kube_features.go

Line 184 in f653e6c

APIPriorityAndFairness: {Default: false, PreRelease: featuregate.Alpha},
to beta?

lavalamp
lavalamp reviewed Nov 12, 2020
View reviewed changes
test/integration/apiserver/BUILD
@@ -38,6 +28,7 @@ go_test(
"//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",
"//staging/src/k8s.io/api/extensions/v1beta1:go_default_library",
"//staging/src/k8s.io/api/flowcontrol/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/flowcontrol/v1beta1:go_default_library",
Copy link
Member

Choose a reason for hiding this comment

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

This looks right, but I don't understand the other changes in this file?

@lavalamp
Copy link
Member

/retest

@lavalamp
Copy link
Member

@adtac, can you prep a follow-up with those changes? Maybe base it on top of Min's commit, in case we need to fix something about the tests to get this to merge.

Everything looks right other than the build file I commented on, so let's at least set the approve bit:
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lavalamp, yue9944882

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 Nov 12, 2020
@adtac adtac mentioned this pull request Nov 12, 2020
Merged
@k8s-ci-robot
Copy link
Contributor

@yue9944882: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce-ubuntu-containerd 718d6c7 link /test pull-kubernetes-e2e-gce-ubuntu-containerd
pull-kubernetes-e2e-gce-100-performance 718d6c7 link /test pull-kubernetes-e2e-gce-100-performance
pull-kubernetes-conformance-kind-ipv6-parallel 718d6c7 link /test pull-kubernetes-conformance-kind-ipv6-parallel
pull-kubernetes-node-e2e 718d6c7 link /test pull-kubernetes-node-e2e
pull-kubernetes-bazel-build 718d6c7 link /test pull-kubernetes-bazel-build
pull-kubernetes-typecheck 718d6c7 link /test pull-kubernetes-typecheck
pull-kubernetes-bazel-test 718d6c7 link /test pull-kubernetes-bazel-test
pull-kubernetes-integration 718d6c7 link /test pull-kubernetes-integration
pull-kubernetes-verify 718d6c7 link /test pull-kubernetes-verify
pull-kubernetes-e2e-kind 718d6c7 link /test pull-kubernetes-e2e-kind

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@kikisdeliveryservice
Copy link
Member

Just to be clear #96527 is replacing this PR entirely?

@adtac
Copy link
Member

adtac commented Nov 12, 2020

Just to be clear #96527 is replacing this PR entirely?

Yes, correct. @yue9944882's timezone means they're probably not awake.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 14, 2020
@k8s-ci-robot
Copy link
Contributor

@yue9944882: PR needs rebase.

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.

@lavalamp lavalamp closed this Nov 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lavalamp lavalamp lavalamp left review comments

@adtac adtac adtac left review comments

@MikeSpreitzer MikeSpreitzer MikeSpreitzer left review comments

@apelisse apelisse Awaiting requested review from apelisse

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

Assignees

@lavalamp lavalamp

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/test 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 needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet