Skip to content
Snippets Groups Projects
Unverified Commit a96a0ee3 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files

Merge pull request #3198 from riverzhang/fix-kubeadm-v1alpha1

Fix kubeadm v1alpha1 configure
parents f48468b8 35e5adaf
No related branches found
No related tags found
No related merge requests found
apiVersion: kubeadm.k8s.io/v1alpha2
apiVersion: kubeadm.k8s.io/v1alpha1
kind: MasterConfiguration
api:
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
......@@ -8,7 +8,6 @@ api:
bindPort: {{ kube_apiserver_port }}
{% endif %}
etcd:
external:
endpoints:
{% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }}
......@@ -29,12 +28,6 @@ kubeProxy:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true
mode: ipvs
{% elif kube_proxy_mode == 'ipvs' %}
kubeProxy:
config:
featureGates:
SupportIPVSProxyMode: true
mode: ipvs
{% endif %}
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment