C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge after rebase

Browse source
This commit is contained in:
jwfang 2017-06-26 16:50:30 +08:00
commit 6876f60f4c
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/kubernetes-apps/ansible/tasks/main.yml
View file

@ -40,7 +40,7 @@
} }
] ]
}' }'
when: dns_mode != 'none' and inventory_hostname == groups['kube-master'][0] when: dns_mode != 'none' and inventory_hostname == groups['kube-master'][0] and rbac_enabled
tags: dnsmasq tags: dnsmasq
- name: Kubernetes Apps | Start Resources - name: Kubernetes Apps | Start Resources
@ -60,4 +60,3 @@
include: tasks/netchecker.yml include: tasks/netchecker.yml
when: deploy_netchecker when: deploy_netchecker
tags: netchecker tags: netchecker

6
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
View file

@ -41,9 +41,6 @@ spec:
- mountPath: "{{ kube_config_dir }}/ssl" - mountPath: "{{ kube_config_dir }}/ssl"
name: etc-kube-ssl name: etc-kube-ssl
readOnly: true readOnly: true
- mountPath: {{kube_config_dir}}/kube-proxy-kubeconfig.yaml
name: "kubeconfig"
readOnly: true
- mountPath: "{{ kube_config_dir }}/kube-proxy-kubeconfig.yaml" - mountPath: "{{ kube_config_dir }}/kube-proxy-kubeconfig.yaml"
name: kubeconfig name: kubeconfig
readOnly: true readOnly: true
@ -64,9 +61,6 @@ spec:
- name: kubeconfig - name: kubeconfig
hostPath: hostPath:
path: "{{ kube_config_dir }}/kube-proxy-kubeconfig.yaml" path: "{{ kube_config_dir }}/kube-proxy-kubeconfig.yaml"
- name: "etc-kube-ssl"
hostPath:
path: "{{kube_config_dir}}/ssl"
- name: var-run-dbus - name: var-run-dbus
hostPath: hostPath:
path: /var/run/dbus path: /var/run/dbus