Skip to content

Bug 1874056: Rebase k8s to 1.19.0 #547

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
Merged
openshift-merge-robot merged 4 commits into from
Sep 9, 2020
Merged

Bug 1874056: Rebase k8s to 1.19.0 #547

openshift-merge-robot merged 4 commits into from
Sep 9, 2020

Conversation

@damemi
Copy link
Contributor

@damemi damemi commented Sep 1, 2020

Previous PR that included patches to master for 1.19-rc.1: #491

openshift/kubernetes fork bump: openshift/kubernetes#324

@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 Sep 1, 2020
@damemi damemi force-pushed the oc-4.6-k8s-1.19-rebase branch from 510b8c1 to 47be1a8 Compare September 2, 2020 15:21
@damemi damemi changed the title [wip] Rebase k8s to 1.19.0 Rebase k8s to 1.19.0 Sep 2, 2020
@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 Sep 2, 2020
@damemi
Copy link
Contributor Author

damemi commented Sep 2, 2020

/retest

@damemi damemi force-pushed the oc-4.6-k8s-1.19-rebase branch 2 times, most recently from 4bddbfb to 4711488 Compare September 2, 2020 17:31
@damemi damemi changed the title Rebase k8s to 1.19.0 Bug 1874056: Rebase k8s to 1.19.0 Sep 2, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label Sep 2, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 2, 2020

@damemi: This pull request references Bugzilla bug 1874056, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
Details

In response to this:

Bug 1874056: Rebase k8s to 1.19.0

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 2, 2020
@damemi damemi mentioned this pull request Sep 2, 2020
Closed
@soltysh soltysh mentioned this pull request Sep 3, 2020
Closed
@damemi damemi mentioned this pull request Sep 3, 2020
Closed
@soltysh
Copy link
Contributor

soltysh commented Sep 3, 2020

/retest

1 similar comment
@jottofar
Copy link
Contributor

jottofar commented Sep 3, 2020

/retest

@damemi
Copy link
Contributor Author

damemi commented Sep 4, 2020

Update: this is currently waiting on the following 2 PRs:

  1. Bug 1874056: bump(openshift+k8s) to 1.19 origin#25468, which depends on
  2. Bug 1873043: Rebase 1.19.0 kubernetes#325

After these 2 merge the e2e-cmd failures should be resolved

@soltysh
Copy link
Contributor

soltysh commented Sep 8, 2020

@damemi this failure is legit:

[ERROR] test/cmd/config.sh:46: os::cmd::expect_failure_and_text 'env -u KUBERNETES_SERVICE_HOST oc get buildconfigs --context=""' 'Missing or incomplete configuration info';

we missed this pick openshift/kubernetes-client-go#18
Re-run go.mod and you should be good to go.

@damemi
bump(k8s.io): to 1.19
91ed2df
@damemi
React to bump
a55f81e 
This reacts to the changes in openshift/api#521, which
introduced a new configv1.Release type in the CVO.
@damemi
Skip Helm types in describers test
4e35f1e
@damemi damemi force-pushed the oc-4.6-k8s-1.19-rebase branch from 9169a3e to 4e35f1e Compare September 8, 2020 12:46
@damemi
Copy link
Contributor Author

damemi commented Sep 8, 2020

Revendored to pull in openshift/kubernetes-client-go#18

@damemi
Copy link
Contributor Author

damemi commented Sep 8, 2020

/retest

3 similar comments
@damemi
Copy link
Contributor Author

damemi commented Sep 8, 2020

/retest

@damemi
Copy link
Contributor Author

damemi commented Sep 8, 2020

/retest

@damemi
Copy link
Contributor Author

damemi commented Sep 9, 2020

/retest

@damemi
Copy link
Contributor Author

damemi commented Sep 9, 2020

/retest

@soltysh
Copy link
Contributor

soltysh commented Sep 9, 2020

Failures are not related with this change.
/override ci/prow/e2e-cmd

soltysh
soltysh approved these changes Sep 9, 2020
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 9, 2020

@soltysh: Overrode contexts on behalf of soltysh: ci/prow/e2e-cmd

Details

In response to this:

Failures are not related with this change.
/override ci/prow/e2e-cmd

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.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 9, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damemi, soltysh

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 9, 2020
@openshift-merge-robot openshift-merge-robot merged commit 20df740 into openshift:master Sep 9, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 9, 2020

@damemi: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state.

Bugzilla bug 1874056 has not been moved to the MODIFIED state.

Details

In response to this:

Bug 1874056: Rebase k8s to 1.19.0

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.

This was referenced Sep 15, 2020
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

1 more reviewer

@soltysh soltysh soltysh approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@soltysh soltysh

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@damemi @openshift-ci-robot @soltysh @jottofar @openshift-merge-robot