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

v1.11.1 #20354

Merged
merged 6 commits into from
Jul 24, 2018
Merged

v1.11.1 #20354

merged 6 commits into from
Jul 24, 2018

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Jul 18, 2018 •
edited
Loading

Prereqs:

follow-up:

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 18, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 18, 2018
@bparees bparees removed their request for review July 18, 2018 17:42
@liggitt
Copy link
Contributor Author

liggitt commented Jul 18, 2018

/assign @deads2k @mfojtik

ready for review while we wait for green CI and I get the bot set up on the new fork branches. dropped upstream commits listed in the description of openshift/kubernetes#66

@liggitt
Copy link
Contributor Author

liggitt commented Jul 19, 2018

/test all

@liggitt
Copy link
Contributor Author

liggitt commented Jul 19, 2018

/retest

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2018
@mfojtik
Copy link
Contributor

mfojtik commented Jul 20, 2018

Changes LGTM.

@ravisantoshgudimetla
Copy link
Contributor

@liggitt Are the test failures flakes? If yes, after rebase could this be manually merged?

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 23, 2018
@liggitt liggitt changed the title WIP - v1.11.1 v1.11.1 Jul 23, 2018
@openshift-ci-robot openshift-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 Jul 23, 2018
deads2k
deads2k reviewed Jul 23, 2018
View reviewed changes
pkg/cmd/server/kubernetes/master/master_config_test.go
@@ -321,7 +321,15 @@ func TestCMServerDefaults(t *testing.T) {
ConcurrentGCSyncs: 20,
EnableGarbageCollector: true,
GCIgnoredResources: []componentconfig.GroupResource{
{Group: "extensions", Resource: "replicationcontrollers"},
Copy link
Contributor

Choose a reason for hiding this comment

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

I thought we picked the change that took this just to events here: #20242 did we lose the upstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

upstream for 1.11 just dropped the two resources that actually broke gc (apiservice and crd)

@liggitt liggitt mentioned this pull request Jul 23, 2018
Merged
@deads2k
Copy link
Contributor

deads2k commented Jul 23, 2018

unit - github.com/openshift/origin/vendor/k8s.io/apiserver/pkg/storage/tests TestStartingResourceVersion 5.78s

gcp, no output

cross - cannot allocate memory

/retest

@mfojtik
Copy link
Contributor

mfojtik commented Jul 24, 2018

/retest

@liggitt liggitt changed the title v1.11.1 WIP - v1.11.1 Jul 24, 2018
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 24, 2018
@liggitt
Copy link
Contributor Author

liggitt commented Jul 24, 2018

green CI on 3f9c90a

dropped TMP glide yaml commit, reran update-deps, only incoming changes were glide.lock/glide.yaml files from upstream merges

@liggitt liggitt changed the title WIP - v1.11.1 v1.11.1 Jul 24, 2018
@openshift-ci-robot openshift-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 Jul 24, 2018
@deads2k
Copy link
Contributor

deads2k commented Jul 24, 2018

lgtm. Last run was green, no diff. merging.

@deads2k deads2k merged commit ec1b692 into openshift:master Jul 24, 2018
@liggitt liggitt deleted the 1.11.1 branch July 24, 2018 14:57
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 24, 2018 •
edited
Loading

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

Test name Commit Details Rerun command
ci/prow/integration 670f772 link /test integration
ci/prow/verify 670f772 link /test verify
ci/prow/gcp 670f772 link /test gcp
ci/prow/cross 670f772 link /test cross

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k deads2k left review comments

Assignees

@mfojtik mfojtik

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@liggitt @openshift-ci-robot @mfojtik @ravisantoshgudimetla @deads2k @openshift-bot