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

Add convenience container-runtime flag for kubeadm #2052

Merged
merged 6 commits into from
Oct 17, 2017
Merged

Conversation

r2d4
Copy link
Contributor

@r2d4 r2d4 commented Oct 11, 2017

Depends on #2037

To enable the cri-o runtime you may now just use

minikube start --container-runtime=cri-o --bootstrapper=kubeadm

or

minikube start --container-runtiume=crio --bootstrapper=kubeadm

or

minikube start --extra-config=kubelet.container-runtime=remote
--extra-config=kubelet.container-runtime-endpoint=/var/run/crio.sock
--extra-config=image-service-endpoint=/var/run/crio.sock

@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 Oct 11, 2017
@codecov-io
Copy link

codecov-io commented Oct 11, 2017

Codecov Report

Merging #2052 into master will increase coverage by 0.31%.
The diff coverage is 54.28%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #2052      +/-   ##
=========================================
+ Coverage   28.59%   28.9%   +0.31%     
=========================================
  Files          80      81       +1     
  Lines        5243    5304      +61     
=========================================
+ Hits         1499    1533      +34     
- Misses       3551    3578      +27     
  Partials      193     193
Impacted Files Coverage Δ
pkg/minikube/bootstrapper/kubeadm/templates.go 100% <100%> (ø)
pkg/minikube/bootstrapper/kubeadm/kubeadm.go 10.64% <3.22%> (-1.27%) ⬇️
pkg/minikube/bootstrapper/kubeadm/versions.go 65.43% <92.3%> (+11.33%) ⬆️
pkg/localkube/storage_provisioner.go 0% <0%> (ø) ⬆️
pkg/localkube/kubelet.go 0% <0%> (ø) ⬆️
pkg/minikube/bootstrapper/localkube/commands.go 66.4% <0%> (ø) ⬆️
pkg/util/kubeconfig/config.go 47.61% <0%> (+0.68%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c28c583...37456d2. Read the comment docs.

To enable the cri-o runtime you may now just use

`minikube start --container-runtime=cri-o --bootstrapper=kubeadm`
or
`minikube start --container-runtiume=crio --bootstrapper=kubeadm`
or
`minikube start --extra-config=kubelet.container-runtime=remote
--extra-config=kubelet.container-runtime-endpoint=/var/run/crio.sock
--extra-config=image-service-endpoint=/var/run/crio.sock`
@@ -262,17 +302,35 @@ sudo systemctl start kubelet
return nil
}

func parseFeatureGates(featureGates string) (map[string]string, error) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see this used outside of tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

`))

func installWants(containerRuntime string) string {
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you do this directly in the template with an if statement?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

@dlorenc dlorenc left a comment

Choose a reason for hiding this comment

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

15/15 checks. It's beautiful!

@r2d4 r2d4 merged commit 0df72ca into kubernetes:master Oct 17, 2017
@r2d4 r2d4 deleted the cri-o branch October 17, 2017 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants