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

Bump versions to 1.16 #336

Merged
merged 4 commits into from
Oct 8, 2019
Merged

Bump versions to 1.16 #336

merged 4 commits into from
Oct 8, 2019

Conversation

rcarrillocruz
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 7, 2019
@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 7, 2019
@rcarrillocruz rcarrillocruz force-pushed the bump_to_116 branch 3 times, most recently from 1aa4d03 to e490b9b Compare October 7, 2019 10:59
danwinship
danwinship reviewed Oct 7, 2019
View reviewed changes
Gopkg.toml Outdated
# revision for tag "kubernetes-1.12.3"
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
# revision for tag "kubernetes-1.16.0"
revision = "cd179ad6a2693011d6f2fa5cd64c6680ee99379f"
Copy link
Contributor

Choose a reason for hiding this comment

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

@squeed why did we do it this way rather than just doing version = "kubernetes-1.16.0" ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Cargo cullted from a long time ago. As I recall, client-go didn't used to tag k8s versions.

We can almost certainly switch to more meaningful tags now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i support the idea of switching to tags, way more human readable. Can amend later once I sort out CI issues

@rcarrillocruz rcarrillocruz changed the title Bump versions to 1.16 WIP Bump versions to 1.16 Oct 7, 2019
@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 Oct 7, 2019
squeed
squeed reviewed Oct 7, 2019
View reviewed changes
squeed
squeed reviewed Oct 7, 2019
View reviewed changes
pkg/controller/configmap_ca_injector/controller.go Outdated
@@ -124,7 +124,7 @@ func (r *ReconcileConfigMapInjector) Reconcile(request reconcile.Request) (recon

configMapList := &corev1.ConfigMapList{}
selector := labels.Set(map[string]string{names.TRUSTED_CA_BUNDLE_CONFIGMAP_LABEL: "true"}).AsSelector()
err = r.client.List(context.TODO(), &client.ListOptions{LabelSelector: selector}, configMapList)
err = r.client.List(context.TODO(), configMapList, &client.ListOptions{LabelSelector: selector})
Copy link
Contributor

Choose a reason for hiding this comment

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

what!?!? did they seriously change the Client interface? Or was this a bug?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

unsure when, but yeah, interface has the target obj first, filter second. From what I can see it's been like that a couple releases

@rcarrillocruz rcarrillocruz changed the title WIP Bump versions to 1.16 Bump versions to 1.16 Oct 7, 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 7, 2019
squeed
squeed reviewed Oct 8, 2019
View reviewed changes
Gopkg.toml
[[override]]
name = "k8s.io/code-generator"
# revision for tag "kubernetes-1.12.3"
revision = "3dcf91f64f638563e5106f21f50c31fa361c918d"
# revision for tag "kubernetes-1.16.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

I would say we can get rid of these comments :-)

@squeed
Copy link
Contributor

squeed commented Oct 8, 2019

@rcarrillocruz I'll approve this to unblock others, but can you file a follow-up PR that addresses @danwinship's comment around --conntrack-max? We should set the network to Degraded if that option has been passed (or rewrite it to the new destination).

@squeed
Copy link
Contributor

squeed commented Oct 8, 2019

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rcarrillocruz, squeed

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 Oct 8, 2019
@openshift-merge-robot openshift-merge-robot merged commit 83a11c0 into openshift:master Oct 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danwinship danwinship danwinship left review comments

@squeed squeed squeed left review comments

Assignees

@squeed squeed

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rcarrillocruz @squeed @openshift-ci-robot @danwinship @openshift-merge-robot