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.

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

Use Kubernetes 1.16.2 #403

Merged
merged 5 commits into from Oct 31, 2019

Conversation

dmage
Copy link
Member

@dmage dmage commented Oct 23, 2019

No description provided.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 23, 2019
@dmage dmage force-pushed the kubernetes-1.16.2 branch 5 times, most recently from 703fc8e to 738ea45 Compare October 24, 2019 10:07
@dmage
Copy link
Member Author

dmage commented Oct 31, 2019

/retest

1 similar comment
@dmage
Copy link
Member Author

dmage commented Oct 31, 2019

/retest

@dmage dmage changed the title [WIP] Use Kubernetes 1.16.2 Use Kubernetes 1.16.2 Oct 31, 2019
@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 Oct 31, 2019
@dmage
Copy link
Member Author

dmage commented Oct 31, 2019

/retest

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.

Nit on the dependency magnet

@@ -0,0 +1,15 @@
// +build tools

package tools
Copy link
Contributor

Choose a reason for hiding this comment

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

The convention in other repos has been to use the package name dependencymagnet, with filename doc.go. Other contributors may misinterpret tools and add real "tooling" go code.

The package should also have a godoc comment that indicates this is for adding non-go dependencies. See https://github.com/openshift/cluster-openshift-controller-manager-operator/blob/master/dependencymagnet/doc.go as an example.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/search?q=org%3Aopenshift+filename%3Atools.go+%22%2Bbuild+tools%22

And I'd prefer to move this file to hack/codegen and keep script dependencies near the scripts.

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 added a comment to align with other repos

Copy link
Contributor

Choose a reason for hiding this comment

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

@dmage I didn't realize there was an existing convention. The apiserver team seems to have adopted a different convention. Now that I am aware of the tools convention, let's keep it.

https://github.com/search?q=org%3Aopenshift+filename%3Adoc.go+%22%2Bbuild+tools%22

go mod init
: remove versions for replace in go.mod
: use sigs.k8s.io/controller-tools v0.2.1
: use github.com/prometheus/client_golang v0.9.2
: use github.com/prometheus/common v0.4.1
go mod tidy
go mod vendor
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 Oct 31, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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.

@openshift-merge-robot openshift-merge-robot merged commit 1601a59 into openshift:master Oct 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants