c12s-kubespray/roles/kubernetes/master
Raj Perera 992a974b1e Merge branch 'rbac-kp' into rbac-script-cert
# Conflicts:
#	roles/kubernetes-apps/ansible/tasks/main.yml
#	roles/kubernetes-apps/ansible/templates/kubedns-deploy.yml
#	roles/kubernetes-apps/ansible/templates/kubedns-sa.yml
#	roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
#	roles/kubernetes/secrets/files/make-ssl.sh
2017-06-16 11:11:12 -04:00
..
defaults Basic RBAC functionality. (Based from work done by @jwfang (#1351)) 2017-06-16 10:28:23 -04:00
handlers use etcd2 when upgrading unless forced 2017-04-03 15:07:42 +03:00
meta Add tags 2016-12-09 12:14:28 +01:00
tasks certs for system:kube-controller-manager system:kube-scheduler 2017-06-16 14:21:21 +08:00
templates Merge branch 'rbac-kp' into rbac-script-cert 2017-06-16 11:11:12 -04:00
vars Address standalone kubelet config case 2016-12-13 16:35:53 +01:00