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

fix docker-env for kic drivers #6487

Merged
merged 5 commits into from
Feb 4, 2020
Merged

Conversation

medyagh
Copy link
Member

@medyagh medyagh commented Feb 4, 2020

  • refactor provision package to be reusable for non-buildroot
    ( created a new provisioner called ubuntuProvisioner and broke down the package two three files and created an interface)
  • configure docker on vm and container same way
  • fixes crictl setting that caused cache integration test failure kic test failure: verify_cache_inside_node : different output of crictil and docker images #6445
  • remove dependency on minikube-automount.service only for kic driver (till we implement mount for kic)
After=network.target  minikube-automount.service docker.socket
Requires= minikube-automount.service docker.socket 

closes #6485
closes #6463
closes #6445

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Feb 4, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: medyagh

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 Feb 4, 2020
@medyagh medyagh changed the title refactor provision fix docker-env fix docker-env for kic drivers Feb 4, 2020
@medyagh
Copy link
Member Author

medyagh commented Feb 4, 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 Feb 4, 2020
@codecov-io
Copy link

codecov-io commented Feb 4, 2020

Codecov Report

Merging #6487 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6487      +/-   ##
==========================================
- Coverage   37.84%   37.83%   -0.02%     
==========================================
  Files         128      128              
  Lines        8748     8752       +4     
==========================================
  Hits         3311     3311              
- Misses       5011     5015       +4     
  Partials      426      426
Impacted Files Coverage Δ
pkg/minikube/machine/client.go 43.84% <0%> (-1.4%) ⬇️

@TravisBuddy
Copy link

Travis tests have failed

Hey @medyagh,
Please read the following log in order to understand the failure reason.
It'll be awesome if you fix what's wrong and commit the changes.

TravisBuddy Request Identifier: 12a96850-471c-11ea-9b02-35c319a1fc79

@minikube-pr-bot
Copy link

All Times minikube: [ 97.621944 96.740503 96.145503]
All Times Minikube (PR 6487): [ 103.340056 95.654061 94.456414]

Average minikube: 96.835983
Average Minikube (PR 6487): 97.816844

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6487) |
+----------------------+-----------+--------------------+
| minikube v           |  0.339566 |           0.311783 |
| Creating kvm2        | 19.797821 |          20.089309 |
| Preparing Kubernetes | 50.031443 |          49.413409 |
| Pulling images       |  3.626224 |           6.050202 |
| Launching Kubernetes | 20.260798 |          19.287218 |
| Waiting for cluster  |  1.056335 |           1.068945 |
+----------------------+-----------+--------------------+

@minikube-pr-bot
Copy link

All Times Minikube (PR 6487): [ 96.373186 101.713492 97.786637]
All Times minikube: [ 96.445573 97.918290 99.741038]

Average minikube: 98.034967
Average Minikube (PR 6487): 98.624438

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6487) |
+----------------------+-----------+--------------------+
| minikube v           |  0.323565 |           0.292756 |
| Creating kvm2        | 20.356928 |          20.751513 |
| Preparing Kubernetes | 50.693869 |          50.739073 |
| Pulling images       |  3.780586 |           3.753019 |
| Launching Kubernetes | 19.856643 |          20.146073 |
| Waiting for cluster  |  1.382819 |           1.059858 |
+----------------------+-----------+--------------------+

@tstromberg tstromberg merged commit 2fd3363 into kubernetes:master Feb 4, 2020
@afbjorklund
Copy link
Collaborator

@medyagh: Weird that the standard Ubuntu provisioner was not working out properly ?

https://github.com/docker/machine/blob/master/libmachine/provision/ubuntu_systemd.go

This seems more like a hack, or suggests that CompatibleWithHost is broken:

		var pv lib_provision.Provisioner
		if driver.IsKIC(h.Driver.DriverName()) {
			pv = provision.NewUbuntuProvisioner(h.Driver)
		} else {
			pv = provision.NewBuildrootProvisioner(h.Driver)
		}

Because libmachine is supposed to be able to detect that, during provisioning:

https://github.com/docker/machine/blob/master/libmachine/provision/provisioner.go#L121_L129

@medyagh medyagh deleted the fix_denv branch May 2, 2020 22:34
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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
7 participants