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

Automated cherry pick of #66932 #67433: Include unavailable API services in discovery response, allow failed discovery on initial quota controller start #67154

Merged
merged 2 commits into from
Aug 21, 2018
Merged

Automated cherry pick of #66932 #67433: Include unavailable API services in discovery response, allow failed discovery on initial quota controller start #67154

merged 2 commits into from
Aug 21, 2018

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Aug 8, 2018 •
edited

Cherry pick of #66932 #67433 on release-1.11.

#66932: Include unavailable API services in discovery response
#67433: allow failed discovery on initial quota controller start

kube-apiserver now includes all registered API groups in discovery, including registered extension API group/versions for unavailable extension API servers.
kube-controller-manager can now start the quota controller when discovery results can only be partially determined.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 8, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Aug 8, 2018
@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Aug 8, 2018
@liggitt
Copy link
Member Author

liggitt commented Aug 8, 2018

/sig api-machinery
/kind bug
/assign @foxish

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. kind/bug Categorizes issue or PR as related to a bug. labels Aug 8, 2018
@liggitt
Copy link
Member Author

liggitt commented Aug 8, 2018

/milestone v1.11

@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Aug 8, 2018
@nilebox
Copy link

nilebox commented Aug 9, 2018

apiserver_test.go:369: Discovery call expected to return failed unavailable service

Hmm, was there some other change post-1.11 in master that affected this behavior?..

@nilebox
Copy link

nilebox commented Aug 9, 2018

In 1.10 this test did succeed, probably some flakiness related to the wait duration.

@nilebox
Copy link

nilebox commented Aug 9, 2018

/test pull-kubernetes-integration

@nilebox nilebox mentioned this pull request Aug 9, 2018
Closed
@liggitt
Copy link
Member Author

liggitt commented Aug 9, 2018

In 1.10 this test did succeed, probably some flakiness related to the wait duration.

yeah, 100ms might not be long enough to wait... might consider changing that to a poll in master to get the expected result or fail after N seconds

@nilebox nilebox mentioned this pull request Aug 13, 2018
Merged
@nilebox
Copy link

nilebox commented Aug 13, 2018

@liggitt please see PR #67325 fixing the flakiness.

@nilebox
Copy link

nilebox commented Aug 14, 2018

@foxish can you review this cherry pick please? We need it to fix a critical bug in Service Catalog

@liggitt
Copy link
Member Author

liggitt commented Aug 15, 2018

/assign @deads2k
for lgtm/approve

k8s-github-robot pushed a commit that referenced this pull request Aug 15, 2018
Merge pull request #67325 from nilebox/discovery-test-wait
330cf37 
Automatic merge from submit-queue (batch tested with PRs 67294, 67320, 67335, 67334, 67325). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add wait to discovery integration test to fix flakiness

**What this PR does / why we need it**:
Reduce the flakiness of the discovery test that was introduced in #66932  (see cherry-pick PR #67154 for report on flaky failure and suggestions).

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@liggitt
Copy link
Member Author

liggitt commented Aug 15, 2018

/hold

needs to wait for a pick of #67433 to allow the controller manager to start correctly in partial discovery cases (since the workload controllers need to be able to start in order to start back up aggregated servers that are down in order to resolve the 503 errors)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 15, 2018
@nilebox nilebox mentioned this pull request Aug 20, 2018
Merged
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 20, 2018
@liggitt liggitt changed the title Automated cherry pick of #66932: Include unavailable API services in discovery response Automated cherry pick of #66932 #67433: Include unavailable API services in discovery response, allow failed discovery on initial quota controller start Aug 20, 2018
@liggitt
Copy link
Member Author

liggitt commented Aug 20, 2018

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 20, 2018
@foxish foxish added cherrypick-candidate 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 Aug 20, 2018
@foxish
Copy link
Contributor

foxish commented Aug 20, 2018

@liggitt, can someone from api-machinery lgtm/approve this?

@deads2k
Copy link
Contributor

deads2k commented Aug 21, 2018

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Aug 21, 2018
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 6c8b476 into kubernetes:release-1.11 Aug 21, 2018
@cheftako cheftako mentioned this pull request Aug 30, 2018
Closed
@yagonobre
Copy link
Member

When we will have a 1.11 release?

@foxish
Copy link
Contributor

foxish commented Sep 6, 2018

Planned today, but blocked on #68372

@seans3 seans3 mentioned this pull request Jan 6, 2019
Open
@liggitt liggitt deleted the automated-cherry-pick-of-#66932-upstream-release-1.11 branch April 22, 2019 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@erictune erictune Awaiting requested review from erictune

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@foxish foxish

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@liggitt @nilebox @foxish @deads2k @k8s-ci-robot @k8s-github-robot @yagonobre