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

Kubernetes v0.19.0 #167

Merged
merged 2 commits into from Aug 12, 2020
Merged

Kubernetes v0.19.0 #167

merged 2 commits into from Aug 12, 2020

Conversation

otaviof
Copy link
Member

@otaviof otaviof commented Aug 5, 2020

Upgrading Go modules and replacement statements to use v0.19.0-rc.3.

@otaviof
Copy link
Member Author

otaviof commented Aug 5, 2020

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 5, 2020
@otaviof otaviof changed the title Kubernetes 1.19 WIP: Kubernetes 1.19 Aug 5, 2020
@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 Aug 5, 2020
@otaviof
Copy link
Member Author

otaviof commented Aug 5, 2020

/assign @adambkaplan

/cc @gabemontero, @coreydaley

@gabemontero
Copy link
Contributor

the org gets rather precise when it comes to the exact commit message @otaviof for these gomod/vendor changes

take a look at the commit message from either my samples or @coreydaley 's OCM PRs and try to follow that pattern

@otaviof otaviof changed the title WIP: Kubernetes 1.19 WIP: Kubernetes v0.19.0 Aug 5, 2020
@otaviof
Copy link
Member Author

otaviof commented Aug 6, 2020

/test e2e-aws
/test e2e-aws-builds
/test e2e-aws-image-ecosystem

adambkaplan
adambkaplan requested changes Aug 6, 2020
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@otaviof otaviof force-pushed the BUILD-60 branch 2 times, most recently from fdecc26 to e9fcb0b Compare August 7, 2020 09:34
adambkaplan
adambkaplan requested changes Aug 7, 2020
View reviewed changes
Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

A nit on the commit history - when dependency bumps force changes in our code, we always split the PR into two commits:

  1. The bump(*) commit with the changes to go.mod, go.sum, and the vendored dependencies
  2. A follow-up commit with the changes needed to get the application to compile/function.

This makes reviews simpler to follow. Please split the changes not related to vendoring on go.mod updates into a separate commit.

go.mod
)

replace (
github.com/containerd/containerd => github.com/containerd/containerd v1.3.2
github.com/docker/docker => github.com/openshift/moby-moby v1.4.2-0.20190308215630-da810a85109d
github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20171107005402-dcf79f8c7fcb
github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f
// testing changes
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc90
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this replace necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm removing this replace block, and running go mod tidy. As you can see it skewed runc and runtime-spec a bit. Should we keep with a replace statement instead?

Copy link
Member Author

@otaviof otaviof Aug 10, 2020 •
edited

Choose a reason for hiding this comment

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

I end up adding the replace statements again, due the following errors:

$ make build
hack/build.sh
# github.com/opencontainers/runtime-tools/generate
vendor/github.com/opencontainers/runtime-tools/generate/config.go:184:13: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:185:11: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:185:18: undefined: specs.VM
vendor/github.com/opencontainers/runtime-tools/generate/config.go:191:14: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:192:11: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:192:28: undefined: specs.VMHypervisor
vendor/github.com/opencontainers/runtime-tools/generate/config.go:198:14: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:199:11: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:199:24: undefined: specs.VMKernel
vendor/github.com/opencontainers/runtime-tools/generate/config.go:205:14: g.Config.VM undefined (type *specs.Spec has no field or method VM)
vendor/github.com/opencontainers/runtime-tools/generate/config.go:205:14: too many errors
make: *** [Makefile:11: build] Error 2

@otaviof otaviof force-pushed the BUILD-60 branch 2 times, most recently from 2a3502a to e36cfae Compare August 7, 2020 14:58
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 7, 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 Aug 7, 2020
@otaviof
Copy link
Member Author

otaviof commented Aug 7, 2020

/retest

4 similar comments
@otaviof
Copy link
Member Author

otaviof commented Aug 7, 2020

/retest

@otaviof
Copy link
Member Author

otaviof commented Aug 8, 2020

/retest

@otaviof
Copy link
Member Author

otaviof commented Aug 10, 2020

/retest

@otaviof
Copy link
Member Author

otaviof commented Aug 10, 2020

/retest

@adambkaplan
Copy link
Contributor

/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 10, 2020
@adambkaplan
Copy link
Contributor

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 10, 2020
@otaviof
Copy link
Member Author

otaviof commented Aug 11, 2020

/test e2e-aws

@otaviof otaviof changed the title WIP: Kubernetes v0.19.0 Kubernetes v0.19.0 Aug 11, 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 Aug 11, 2020
@otaviof
Copy link
Member Author

otaviof commented Aug 11, 2020

/test e2e-aws

1 similar comment
@otaviof
Copy link
Member Author

otaviof commented Aug 11, 2020

/test e2e-aws

@coreydaley
Copy link
Member

/retest

adambkaplan
adambkaplan approved these changes Aug 12, 2020
View reviewed changes
Copy link
Contributor

@adambkaplan adambkaplan left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, otaviof

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-bot
Copy link
Contributor

/retest

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

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

@otaviof
Copy link
Member Author

otaviof commented Aug 12, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

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

6 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-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 070e0c7 into openshift:master Aug 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adambkaplan adambkaplan adambkaplan approved these changes

@coreydaley coreydaley Awaiting requested review from coreydaley

Assignees

@adambkaplan adambkaplan

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
7 participants
@otaviof @gabemontero @adambkaplan @coreydaley @openshift-ci-robot @openshift-bot @openshift-merge-robot