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

Use kube_apiserver_port

Browse source
This commit is contained in:
ant31 2015-12-15 16:27:12 +01:00
parent 4055980ce6
commit f21f660cc5
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/tasks/main.yml
View file

@ -47,7 +47,7 @@
- name: wait for the apiserver to be running (pulling image and running container) - name: wait for the apiserver to be running (pulling image and running container)
wait_for: wait_for:
port: 8080 port: "{{kube_apiserver_insecure_port}}"
delay: 10 delay: 10
- name: install required python module 'httplib2' - name: install required python module 'httplib2'

1
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -21,6 +21,7 @@ spec:
- --tls-private-key-file={{ kube_cert_dir }}/apiserver-key.pem - --tls-private-key-file={{ kube_cert_dir }}/apiserver-key.pem
- --service-account-key-file={{ kube_cert_dir }}/apiserver-key.pem - --service-account-key-file={{ kube_cert_dir }}/apiserver-key.pem
- --secure-port={{ kube_apiserver_port }} - --secure-port={{ kube_apiserver_port }}
- --insecure-port={{ kube_apiserver_insecure_port }}
{% if kube_api_runtime_config is defined %} {% if kube_api_runtime_config is defined %}
{% for conf in kube_api_runtime_config %} {% for conf in kube_api_runtime_config %}
- --runtime-config={{ conf }} - --runtime-config={{ conf }}

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

@ -13,7 +13,7 @@ spec:
- proxy - proxy
- --v={{ kube_log_level | default('2') }} - --v={{ kube_log_level | default('2') }}
{% if inventory_hostname in groups['kube-master'] %} {% if inventory_hostname in groups['kube-master'] %}
- --master=http://127.0.0.1:8080 - --master=http://127.0.0.1:{{kube_apiserver_insecure_port}}
{% else %} {% else %}
- --master=https://{{ groups['kube-master'][0] }}:{{kube_apiserver_port }} - --master=https://{{ groups['kube-master'][0] }}:{{kube_apiserver_port }}
- --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml - --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml