kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update defaults to match k8s 1.12 suggestions (#3760) 

* Update defaults to match k8s 1.12 suggestions

* Test if Netchecker works with node ip instead of localhost

* Update defaults to ipvs and coredns

* Update defaults for kube_apiserver_insecure_port

* Update main.yaml
pull/3770/head
Andreas Krüger 2018-11-27 00:36:39 +01:00 committed by k8s-ci-robot
parent 967a042321
commit bad886ca9b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
View File

@ -89,13 +89,13 @@ kube_network_node_prefix: 24
# The port the API Server will be listening on. # The port the API Server will be listening on.
kube_apiserver_ip: "{{ kube_service_addresses|ipaddr('net')|ipaddr(1)|ipaddr('address') }}" kube_apiserver_ip: "{{ kube_service_addresses|ipaddr('net')|ipaddr(1)|ipaddr('address') }}"
kube_apiserver_port: 6443 # (https) kube_apiserver_port: 6443 # (https)
kube_apiserver_insecure_port: 8080 # (http) #kube_apiserver_insecure_port: 8080 # (http)
# Set to 0 to disable insecure port - Requires RBAC in authorization_modes and kube_api_anonymous_auth: true # Set to 0 to disable insecure port - Requires RBAC in authorization_modes and kube_api_anonymous_auth: true
#kube_apiserver_insecure_port: 0 # (disabled) kube_apiserver_insecure_port: 0 # (disabled)
# Kube-proxy proxyMode configuration. # Kube-proxy proxyMode configuration.
# Can be ipvs, iptables # Can be ipvs, iptables
kube_proxy_mode: iptables kube_proxy_mode: ipvs
# Kube-proxy nodeport address. # Kube-proxy nodeport address.
# cidr to bind nodeport services. Flag --nodeport-addresses on kube-proxy manifest # cidr to bind nodeport services. Flag --nodeport-addresses on kube-proxy manifest
@ -111,7 +111,7 @@ cluster_name: cluster.local
# Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods # Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods
ndots: 2 ndots: 2
# Can be dnsmasq_kubedns, kubedns, coredns, coredns_dual, manual or none # Can be dnsmasq_kubedns, kubedns, coredns, coredns_dual, manual or none
dns_mode: kubedns dns_mode: coredns
# Set manual server if using a custom cluster DNS server # Set manual server if using a custom cluster DNS server
#manual_dns_server: 10.x.x.x #manual_dns_server: 10.x.x.x

2
roles/kubernetes/node/defaults/main.yml
View File

@ -18,7 +18,7 @@ kube_resolv_conf: "/etc/resolv.conf"
kube_proxy_healthz_bind_address: "127.0.0.1" kube_proxy_healthz_bind_address: "127.0.0.1"
# Can be ipvs, iptables # Can be ipvs, iptables
kube_proxy_mode: iptables kube_proxy_mode: ipvs
# If using the pure iptables proxy, SNAT everything. Note that it breaks any # If using the pure iptables proxy, SNAT everything. Note that it breaks any
# policy engine. # policy engine.

6
roles/kubespray-defaults/defaults/main.yaml
View File

@ -15,7 +15,7 @@ disable_swap: true
kube_version: v1.12.2 kube_version: v1.12.2
## Kube Proxy mode One of ['iptables','ipvs'] ## Kube Proxy mode One of ['iptables','ipvs']
kube_proxy_mode: iptables kube_proxy_mode: ipvs
# Kube-proxy nodeport address. # Kube-proxy nodeport address.
# cidr to bind nodeport services. Flag --nodeport-addresses on kube-proxy manifest # cidr to bind nodeport services. Flag --nodeport-addresses on kube-proxy manifest
@ -44,7 +44,7 @@ cluster_name: cluster.local
# Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods # Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods
ndots: 2 ndots: 2
# Can be dnsmasq_kubedns, kubedns, manual or none # Can be dnsmasq_kubedns, kubedns, manual or none
dns_mode: kubedns dns_mode: coredns
# Should be set to a cluster IP if using a custom cluster DNS # Should be set to a cluster IP if using a custom cluster DNS
# manual_dns_server: 10.x.x.x # manual_dns_server: 10.x.x.x
@ -142,7 +142,7 @@ kube_apiserver_bind_address: 0.0.0.0
kube_apiserver_port: 6443 kube_apiserver_port: 6443
# http # http
kube_apiserver_insecure_bind_address: 127.0.0.1 kube_apiserver_insecure_bind_address: 127.0.0.1
kube_apiserver_insecure_port: 8080 kube_apiserver_insecure_port: 0
# dynamic kubelet configuration # dynamic kubelet configuration
dynamic_kubelet_configuration: false dynamic_kubelet_configuration: false

4
tests/testcases/040_check-network-adv.yml
View File

@ -42,7 +42,7 @@
delay: 10 delay: 10
- name: Get netchecker agents - name: Get netchecker agents
uri: url=http://localhost:{{netchecker_port}}/api/v1/agents/ return_content=yes uri: url=http://{{ ansible_default_ipv4.address }}:{{netchecker_port}}/api/v1/agents/ return_content=yes
run_once: true run_once: true
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
register: agents register: agents
@ -59,7 +59,7 @@
run_once: true run_once: true
- name: Check netchecker status - name: Check netchecker status
uri: url=http://localhost:{{netchecker_port}}/api/v1/connectivity_check status_code=200 return_content=yes uri: url=http://{{ ansible_default_ipv4.address }}:{{netchecker_port}}/api/v1/connectivity_check status_code=200 return_content=yes
delegate_to: "{{groups['kube-master'][0]}}" delegate_to: "{{groups['kube-master'][0]}}"
run_once: true run_once: true
register: result register: result