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

1.18.0 rebase #351

Merged
merged 8 commits into from Apr 1, 2020
Merged

1.18.0 rebase #351

merged 8 commits into from Apr 1, 2020

Conversation

ingvagabund
Copy link
Member

@ingvagabund ingvagabund commented Mar 19, 2020 •
edited

Previous rebase: https://github.com/openshift/oc/pull/218/commits

There are still some consumers of --dry-run[bool] option:

$ grep -rn "o.DryRun " --include "*.go"
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go:124:	o.DryRun = getClientSideDryRun(cmd)
vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go:157:	if o.DryRun {
pkg/cli/importimage/importimage.go:200:	if o.DryRun {
pkg/cli/debug/debug.go:294:		if o.DryRun {
pkg/cli/admin/release/new.go:1158:			o.DryRun = true
pkg/cli/admin/release/new.go:1227:		if !o.DryRun {
pkg/cli/admin/release/new.go:1233:				if o.DryRun {
pkg/cli/admin/migrate/migrator.go:191:	if o.DryRun {
pkg/cli/admin/migrate/migrator.go:213:		o.DryRun = true
pkg/cli/admin/migrate/migrator.go:215:		o.DryRun = false
pkg/cli/admin/migrate/migrator.go:217:		o.DryRun = true
pkg/cli/rollback/rollback.go:171:		if o.DryRun {
pkg/cli/rollback/rollback.go:257:	if len(o.Format) > 0 || o.DryRun {
pkg/cli/image/extract/extract.go:405:				if o.DryRun {
pkg/cli/image/append/append.go:355:	if o.DryRun {
pkg/cli/image/append/append.go:442:	if !o.DryRun {
pkg/cli/image/mirror/mirror.go:256:	if o.DryRun {
pkg/cli/image/mirror/mirror.go:497:							if o.DryRun {

They define the flag on they own (not through k8s.io/kubectl/pkg/cmd/util.AddDryRunFlag) or they don't set it at all.

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Mar 19, 2020
@ingvagabund ingvagabund force-pushed the 1.18.0-beta.2-rebase branch 7 times, most recently from 6c8e339 to 75219c7 Compare March 24, 2020 12:28
@soltysh soltysh self-assigned this Mar 24, 2020
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 25, 2020
@ingvagabund
Copy link
Member Author

Requires openshift/origin#24765 to get merged to resolve failures in ci/prow/e2e-cmd.
Also, origin tests need to be bumped to 1.18 (openshift/origin#24732) to get hopefully the remaining tests green.

@ingvagabund ingvagabund mentioned this pull request Mar 25, 2020
Closed
@ingvagabund
Copy link
Member Author

/test verify-deps

@ingvagabund
Copy link
Member Author

/retest

@ingvagabund
Copy link
Member Author

/test e2e-cmd

@soltysh
Copy link
Member

soltysh commented Mar 27, 2020

This is stuck waiting for openshift/origin#24769 to land

soltysh
soltysh requested changes Mar 27, 2020
View reviewed changes
Copy link
Member

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

Split the Adjust code on top of 1.18.0-beta.2 commit into the following commits, for readability:

  • context changes
  • dry-run changes
  • other 1.18 changes, although I'm not seeing any other
    The rest looks good.

@ingvagabund
Copy link
Member Author

/test e2e-cmd

@ingvagabund ingvagabund changed the title WIP: 1.18.0 beta.2 rebase 1.18.0 beta.2 rebase Mar 27, 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 Mar 27, 2020
@ingvagabund
Copy link
Member Author

/test e2e-aws

@ingvagabund
Copy link
Member Author

/test e2e-cmd

@ingvagabund
Copy link
Member Author

/test unit

@ingvagabund ingvagabund mentioned this pull request Mar 31, 2020
Merged
@ingvagabund
Copy link
Member Author

/retest

2 similar comments
@ingvagabund
Copy link
Member Author

/retest

@ingvagabund
Copy link
Member Author

/retest

@soltysh
Copy link
Member

soltysh commented Apr 1, 2020

/retest

soltysh
soltysh approved these changes Apr 1, 2020
View reviewed changes
Copy link
Member

@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 openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2020
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

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

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 1, 2020
@ingvagabund
Copy link
Member Author

/test e2e-aws-builds

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 89c0b73 into openshift:master Apr 1, 2020
@ingvagabund ingvagabund deleted the 1.18.0-beta.2-rebase branch April 1, 2020 17:06
@soltysh soltysh mentioned this pull request Apr 2, 2020
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@abhgupta abhgupta Awaiting requested review from abhgupta

@adambkaplan adambkaplan Awaiting requested review from adambkaplan

Assignees

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.

None yet
5 participants
@ingvagabund @soltysh @openshift-ci-robot @openshift-bot @openshift-merge-robot