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

Update to crio-bin v1.13.0 #3515

Merged
merged 8 commits into from
Jan 14, 2019
Merged

Conversation

tstromberg
Copy link
Contributor

@tstromberg tstromberg commented Jan 9, 2019

This ensures proper support for k8s v1.13:

https://github.com/kubernetes-sigs/cri-o#compatibility-matrix-cri-o---kubernetes-clusters

Also, fix broken iso-test that got in my way.

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 9, 2019
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2019
@afbjorklund
Copy link
Collaborator

@tstromberg : would you consider also include some of the config fixes ? (#3190)

Especially the odd root location and storage driver name is getting in the way...

Would be much better to just go with the defaults, than to make up minikube things ?

root="/var/lib/containers/storage"
Path to the "root directory". CRI-O stores all of its data, including containers images, in this directory.

storage_driver="overlay"
Storage driver used to manage the storage of images and containers.

It is basically the same thing, except creating a proper mount for the (standard) dir.

@tstromberg
Copy link
Contributor Author

I can confirm that this build still works with --kubernetes-version=v1.10.x and v1.12.x

@tstromberg
Copy link
Contributor Author

@tstromberg : would you consider also include some of the config fixes ? (#3190)

Good call. I'd love to see that PR get merged, so I updated the tests. I'm going to try to keep this PR as small as possible though. =)

@afbjorklund
Copy link
Collaborator

Sure thing (keeping this PR small), just meant before you were "done" with cri-o ?
Fixing /etc/crictl.yaml (#3194) and updating podman / crictl* would be great too.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: balopat, tstromberg

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

@tstromberg tstromberg merged commit bc638be into kubernetes:master Jan 14, 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants