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

Improve the default crio-bin configuration #3190

Merged
merged 4 commits into from
Jan 16, 2019
Merged

Improve the default crio-bin configuration #3190

merged 4 commits into from
Jan 16, 2019

Conversation

afbjorklund
Copy link
Collaborator

@afbjorklund afbjorklund commented Sep 30, 2018 •
edited
Loading

Cherry-picked some of the podman changes, since they are really for crio-bin. (#2757)

  • use the standard directory and a bind-mount, instead of a prefixed storage directory

  • add the standard docker registry, so that you can run/pull images (like e.g. busybox)

We also need the crictl.yaml fixes, but that needs to be versioned on the CRI (#3043)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 30, 2018
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 30, 2018
@afbjorklund
Copy link
Collaborator Author

Possibly the standard registry should be merged with the /etc/sysconfig/crio.minikube ?

https://github.com/kubernetes/minikube/blob/master/pkg/provision/buildroot.go#L188:L215

That already sets the --insecure-registry

@afbjorklund
Copy link
Collaborator Author

Tried to use a well-defined storage provisioner, so that it can be used by crictl and podman too...

But Jenkins didn't like it, for some reason.

@afbjorklund afbjorklund changed the title Improve the default crio-bin configuration [WIP] Improve the default crio-bin configuration Sep 30, 2018
@k8s-ci-robot k8s-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 Sep 30, 2018
@afbjorklund afbjorklund changed the title [WIP] Improve the default crio-bin configuration Improve the default crio-bin configuration Oct 2, 2018
@k8s-ci-robot k8s-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 2, 2018
@tstromberg
Copy link
Contributor

@afbjorklund - Any idea what the OSX-Hyperkit errors are all about? They seem like a flake, but one I haven't seen yet:

  • FAIL: TestFunctional/Mounting (230.50s)
    util.go:303: Error: open /var/folders/pb/1pdf6kyd1n9fw671gj2162wr0000gp/T/mounttest682921312/frompod: no such file or directory, Retrying in 5s. 40 Retries remaining.

@tstromberg
Copy link
Contributor

@minikube-bot OK to test

@afbjorklund
Copy link
Collaborator Author

@tstromberg : have only tried libvirt (kvm2), sorry

@afbjorklund
Copy link
Collaborator Author

afbjorklund commented Nov 4, 2018 •
edited
Loading

Also fixes issue #2835 (registries missing)

@afbjorklund afbjorklund mentioned this pull request Nov 4, 2018
Closed
@afbjorklund afbjorklund mentioned this pull request Jan 11, 2019
Merged
@tstromberg
Copy link
Contributor

@minikube-bot OK to test

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund, 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

@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 16, 2019
@tstromberg tstromberg merged commit 5d9311b into kubernetes:master Jan 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tstromberg tstromberg tstromberg approved these changes

@balopat balopat Awaiting requested review from balopat

Assignees
No one assigned
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@afbjorklund @tstromberg @k8s-ci-robot