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

Update the crio.conf instead of overwriting it #6219

Merged
merged 4 commits into from
Jan 22, 2020
Merged

Update the crio.conf instead of overwriting it #6219

merged 4 commits into from
Jan 22, 2020

Conversation

afbjorklund
Copy link
Collaborator

Fixes #5677

@afbjorklund
Refactor: move the crio config to the crio runtime
024dfe1 
For some reason it was left with the generic CRI
@afbjorklund
Update the crio.conf instead of overwriting it
723f1f9 
We are only changing one config value, anyway
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 6, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

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 6, 2020
@afbjorklund afbjorklund mentioned this pull request Jan 6, 2020
Closed
@codecov-io
Copy link

codecov-io commented Jan 6, 2020 •
edited
Loading

Codecov Report

Merging #6219 into master will increase coverage by 0.11%.
The diff coverage is 43.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6219      +/-   ##
==========================================
+ Coverage   38.23%   38.34%   +0.11%     
==========================================
  Files         123      124       +1     
  Lines        8262     8363     +101     
==========================================
+ Hits         3159     3207      +48     
- Misses       4694     4736      +42     
- Partials      409      420      +11
Impacted Files Coverage Δ
pkg/minikube/cruntime/cruntime.go 60% <ø> (ø) ⬆️
pkg/minikube/registry/registry.go 100% <ø> (ø) ⬆️
cmd/minikube/cmd/tunnel.go 5.88% <ø> (ø) ⬆️
pkg/minikube/assets/addons.go 37.93% <ø> (ø) ⬆️
pkg/minikube/bootstrapper/bootstrapper.go 0% <0%> (ø) ⬆️
pkg/addons/addons.go 28.18% <0%> (ø) ⬆️
pkg/minikube/bootstrapper/bsutil/binaries.go 13.33% <0%> (ø) ⬆️
pkg/minikube/driver/driver.go 69.86% <0%> (-8.6%) ⬇️
pkg/minikube/bootstrapper/bsutil/kubelet.go 52.38% <33.33%> (-1.47%) ⬇️
pkg/addons/reconcile.go 43.58% <43.58%> (ø)
... and 6 more

@medyagh
Copy link
Member

medyagh commented Jan 7, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jan 7, 2020
@minikube-bot
Copy link
Collaborator

All Times minikube: [ 124.638582 128.181906 123.734581]
All Times Minikube (PR 6219): [ 125.016465 125.862181 117.894741]

Average minikube: 125.518356
Average Minikube (PR 6219): 122.924462

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6219) |
+----------------------+-----------+--------------------+
| minikube v           |  0.371140 |           0.371634 |
| Creating kvm2        | 47.558809 |          47.730241 |
| Preparing Kubernetes | 51.388739 |          48.727624 |
| Pulling images       |  2.999492 |           2.841413 |
| Launching Kubernetes | 20.238408 |          20.452858 |
| Waiting for cluster  |  2.912841 |           2.753719 |
| Done                 |           |                    |
|                      |  0.048927 |           0.046974 |
+----------------------+-----------+--------------------+

@minikube-bot
Copy link
Collaborator

All Times minikube: [ 123.107335 110.087499 122.794099]
All Times Minikube (PR 6219): [ 125.823558 125.121903 124.766097]

Average Minikube (PR 6219): 125.237186
Average minikube: 118.662978

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6219) |
+----------------------+-----------+--------------------+
| minikube v           |  0.284677 |           0.282707 |
| Creating kvm2        | 46.315411 |          46.654912 |
| Preparing Kubernetes | 47.196287 |          51.724028 |
| Pulling images       |  2.884020 |           3.062499 |
| Launching Kubernetes | 19.370692 |          20.728229 |
| Waiting for cluster  |  2.562998 |           2.734763 |
| Done                 |           |                    |
|                      |  0.048893 |           0.050048 |
+----------------------+-----------+--------------------+

@minikube-pr-bot
Copy link

All Times Minikube (PR 6219): [ 130.280601 131.379232 133.523626]
All Times minikube: [ 236.868905 233.495974 232.174124]

Average minikube: 234.179668
Average Minikube (PR 6219): 131.727820

Averages Time Per Log

+----------------------+------------+--------------------+
|         LOG          |  MINIKUBE  | MINIKUBE (PR 6219) |
+----------------------+------------+--------------------+
| minikube v           |   0.355547 |           0.339711 |
| Creating kvm2        | 165.222922 |          50.844007 |
| Preparing Kubernetes |  42.664272 |          51.460099 |
| Pulling images       |   2.423383 |           2.735104 |
| Launching Kubernetes |  20.226050 |          21.691802 |
| Waiting for cluster  |   2.731605 |           2.752411 |
+----------------------+------------+--------------------+

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 17, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 17, 2020
@tstromberg
Copy link
Contributor

/ok-to-test

@tstromberg tstromberg merged commit f1ba031 into kubernetes:master Jan 22, 2020
@afbjorklund afbjorklund mentioned this pull request Jan 22, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@priyawadhwa priyawadhwa Awaiting requested review from priyawadhwa

@RA489 RA489 Awaiting requested review from RA489

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

crio.conf is hard-coded to a specific version
7 participants
@afbjorklund @k8s-ci-robot @codecov-io @medyagh @minikube-bot @minikube-pr-bot @tstromberg