External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-19 20:20:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Revert "Add HA/LB endpoints for kube-apiserver"

Browse Source 
This reverts commit a70c3b661e.
This commit is contained in:
Matthew Mosesohn
2016-07-22 13:54:38 +03:00
parent 296eccd238
commit 7f212ca9cb
8 changed files with 37 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/master/templates/kube-apiserver.j2
View File

@@ -21,7 +21,7 @@ KUBE_ALLOW_PRIV="--allow_privileged=true"
KUBE_API_PORT="--insecure-port={{kube_apiserver_insecure_port}} --secure-port={{ kube_apiserver_port }}"
# Insecure API address (default is localhost)
KUBE_API_INSECURE_BIND="--insecure-bind-address={{ kube_apiserver_insecure_bind_address }}"
KUBE_API_INSECURE_BIND="--insecure-bind-address={{ kube_apiserver_insecure_bind_address | default('127.0.0.1') }}"
# Address range to use for services
KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range={{ kube_service_addresses }}"
@@ -42,7 +42,7 @@ KUBE_RUNTIME_CONFIG="{% if kube_api_runtime_config is defined %}{% for conf in k
KUBE_TLS_CONFIG="--tls_cert_file={{ kube_cert_dir }}/apiserver.pem --tls_private_key_file={{ kube_cert_dir }}/apiserver-key.pem --client_ca_file={{ kube_cert_dir }}/ca.pem"
# Add you own!
KUBE_API_ARGS="--token_auth_file={{ kube_token_dir }}/known_tokens.csv --basic-auth-file={{ kube_users_dir }}/known_users.csv --service_account_key_file={{ kube_cert_dir }}/apiserver-key.pem --advertise-address={{ kube_apiserver_address }}"
KUBE_API_ARGS="--token_auth_file={{ kube_token_dir }}/known_tokens.csv --basic-auth-file={{ kube_users_dir }}/known_users.csv --service_account_key_file={{ kube_cert_dir }}/apiserver-key.pem --advertise-address={{ ip | default(ansible_default_ipv4.address) }}"
{% if cloud_provider is defined and cloud_provider == "openstack" %}
KUBELET_CLOUDPROVIDER="--cloud-provider={{ cloud_provider }} --cloud-config={{ kube_config_dir }}/cloud_config"

2
roles/kubernetes/master/templates/kubectl-kubeconfig.yaml.j2
View File

@@ -5,7 +5,7 @@ preferences: {}
clusters:
- cluster:
certificate-authority-data: {{ kube_node_cert|b64encode }}
server: {{ kube_apiserver_endpoint }}
server: https://{{ groups['kube-master'][0] }}:{{ kube_apiserver_port }}
name: {{ cluster_name }}
contexts:
- context:

6
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View File

@@ -11,11 +11,7 @@ spec:
command:
- /hyperkube
- controller-manager
{% if kube_controller_insecure %}
- --master={{ kube_apiserver_insecure_endpoint }}
{% else %}
- --master={{ kube_apiserver_endpoint }}
{% endif %}
- --master=http://127.0.0.1:{{kube_apiserver_insecure_port}}
- --leader-elect=true
- --service-account-private-key-file={{ kube_cert_dir }}/apiserver-key.pem
- --root-ca-file={{ kube_cert_dir }}/ca.pem

6
roles/kubernetes/master/templates/manifests/kube-scheduler.manifest.j2
View File

@@ -12,11 +12,7 @@ spec:
- /hyperkube
- scheduler
- --leader-elect=true
{% if kube_scheduler_insecure %}
- --master={{ kube_apiserver_insecure_endpoint }}
{% else %}
- --master={{ kube_apiserver_endpoint }}
{% endif %}
- --master=http://127.0.0.1:{{kube_apiserver_insecure_port}}
- --v={{ kube_log_level | default('2') }}
livenessProbe:
httpGet:

2
roles/kubernetes/node/templates/kubelet.j2
View File

@@ -8,7 +8,7 @@ KUBE_LOGGING="--logtostderr=true"
KUBE_LOG_LEVEL="--v={{ kube_log_level | default('2') }}"
KUBE_ALLOW_PRIV="--allow_privileged=true"
{% if inventory_hostname in groups['kube-node'] %}
KUBELET_API_SERVER="--api_servers={{ kube_apiserver_access_endpoint }}"
KUBELET_API_SERVER="--api_servers={% for host in groups['kube-master'] %}https://{{ hostvars[host]['access_ip'] | default(hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address'])) }}:{{ kube_apiserver_port }}{% if not loop.last %},{% endif %}{% endfor %}"
{% endif %}
# The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)
KUBELET_ADDRESS="--address={{ ip | default("0.0.0.0") }}"

10
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
View File

@@ -12,10 +12,14 @@ spec:
- /hyperkube
- proxy
- --v={{ kube_log_level | default('2') }}
{% if kube_proxy_insecure %}
- --master={{ kube_apiserver_insecure_endpoint }}
{% if inventory_hostname in groups['kube-master'] %}
- --master=http://127.0.0.1:{{kube_apiserver_insecure_port}}
{% else %}
- --master={{ kube_apiserver_access_endpoint }}
{% if loadbalancer_apiserver is defined and apiserver_loadbalancer_domain_name is defined %}
- --master=https://{{ apiserver_loadbalancer_domain_name }}:{{ loadbalancer_apiserver.port }}
{% else %}
- --master=https://{{ hostvars[groups['kube-master'][0]]['access_ip'] | default(hostvars[groups['kube-master'][0]]['ip'] | default(hostvars[groups['kube-master'][0]]['ansible_default_ipv4']['address'])) }}:{{ kube_apiserver_port }}
{% endif%}
- --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml
{% endif %}
- --bind-address={{ ip | default(ansible_default_ipv4.address) }}

34
roles/kubernetes/preinstall/tasks/set_facts.yml
View File

@@ -1,38 +1,4 @@
---
- set_fact: kube_apiserver_count="{{ groups['kube-master'] | length }}"
- set_fact: kube_apiserver_address="{{ ip | default(ansible_default_ipv4['address']) }}"
- set_fact: kube_apiserver_access_address="{{ access_ip | default(kube_apiserver_address) }}"
- set_fact:
kube_apiserver_insecure_bind_address: |-
{% if loadbalancer_apiserver_localhost %}
{{ kube_apiserver_address }}{% else %}127.0.0.1{% endif %}
- set_fact:
apiserver_access_port: |-
{% if loadbalancer_apiserver is defined and loadbalancer_apiserver.port is defined %}
{{ loadbalancer_apiserver.port }}{% else %}{{ kube_apiserver_port }}{% endif %}
- set_fact:
kube_apiserver_endpoint: |-
{% if loadbalancer_apiserver_localhost %}
https://127.0.0.1:{{ apiserver_access_port }}
{% else -%}
https://{{ apiserver_loadbalancer_domain_name|default(kube_apiserver_access_address) }}:{{ apiserver_access_port }}
{%- endif %}
- set_fact: kube_apiserver_insecure_endpoint="http://{{ kube_apiserver_insecure_bind_address }}:{{ kube_apiserver_insecure_port }}"
- set_fact:
kube_apiserver_access_endpoint: |-
{% if kube_apiserver_multiaccess %}
{% for host in groups['kube-master'] -%}
https://{{ hostvars[host].kube_apiserver_access_address }}:{{ kube_apiserver_port }}{% if not loop.last %},{% endif %}
{%- endfor %}
{% else %}{{ kube_apiserver_endpoint }}{% endif %}
- set_fact:
kube_apiserver_insecure_access_endpoint: |-
{% if kube_apiserver_multiaccess %}
{% for host in groups['kube-master'] -%}
https://{{ hostvars[host].kube_apiserver_insecure_bind_address }}:{{ kube_apiserver_insecure_port }}{% if not loop.last %},{% endif %}
{%- endfor %}
{% else %}{{ kube_apiserver_insecure_endpoint }}{% endif %}
- set_fact: etcd_address="{{ ip | default(ansible_default_ipv4['address']) }}"
- set_fact: etcd_access_address="{{ access_ip | default(etcd_address) }}"
- set_fact: etcd_peer_url="http://{{ etcd_access_address }}:2380"