Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kubespray
- Activity
- Members
- Model registry

Snippets Groups Projects

e47eeb67

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

Downloads
- Plain Diff

Merge pull request #3344 from woopstar/kubeadm-minor-fix

Sync manifests from non-kubeadm to kubeadm deploy

parents 824199fc 940d2fdb

No related branches found

No related tags found

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 21 additions, 3 deletions

...bernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 14 additions, 3 deletions

...bernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2 4 additions, 4 deletions

...tes/master/templates/manifests/kube-apiserver.manifest.j2
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 1 addition, 1 deletion

...r/templates/manifests/kube-controller-manager.manifest.j2
roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2 1 addition, 1 deletion

...tes/master/templates/manifests/kube-scheduler.manifest.j2
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 1 addition, 0 deletions

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

roles/kubespray-defaults/defaults/main.yaml

with 45 additions and 12 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