Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

3bfda55f

Unverified Commit 3bfda55f authored 6 years ago by k8s-ci-robot Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #3061 from okamototk/crio

cri-o support

parents f82a1933 c0dfa727

No related branches found

No related tags found

No related merge requests found

Changes 26

Hide whitespace changes

Inline Side-by-side

Showing

roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 7 additions, 0 deletions

roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
roles/kubernetes/node/templates/kubelet.standard.env.j2 6 additions, 0 deletions

roles/kubernetes/node/templates/kubelet.standard.env.j2
roles/kubespray-defaults/defaults/main.yaml 5 additions, 3 deletions

roles/kubespray-defaults/defaults/main.yaml
roles/reset/tasks/main.yml 10 additions, 0 deletions

roles/reset/tasks/main.yml
scale.yml 3 additions, 1 deletion

scale.yml
upgrade-cluster.yml 2 additions, 1 deletion

upgrade-cluster.yml

with 33 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment