Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
35e5adaf
Commit
35e5adaf
authored
6 years ago
by
rongzhang
Browse files
Options
Downloads
Patches
Plain Diff
Fix kubeadm v1alpha1 configure
parent
a268a49e
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
+6
-13
6 additions, 13 deletions
...bernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
with
6 additions
and
13 deletions
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
+
6
−
13
View file @
35e5adaf
apiVersion: kubeadm.k8s.io/v1alpha
2
apiVersion: kubeadm.k8s.io/v1alpha
1
kind: MasterConfiguration
kind: MasterConfiguration
api:
api:
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
...
@@ -8,14 +8,13 @@ api:
...
@@ -8,14 +8,13 @@ api:
bindPort: {{ kube_apiserver_port }}
bindPort: {{ kube_apiserver_port }}
{% endif %}
{% endif %}
etcd:
etcd:
external:
endpoints:
endpoints:
{% for endpoint in etcd_access_addresses.split(',') %}
{% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }}
- {{ endpoint }}
{% endfor %}
{% endfor %}
caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem
caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem
certFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}.pem
certFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}.pem
keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem
keyFile: {{ kube_config_dir }}/ssl/etcd/node-{{ inventory_hostname }}-key.pem
networking:
networking:
dnsDomain: {{ dns_domain }}
dnsDomain: {{ dns_domain }}
serviceSubnet: {{ kube_service_addresses }}
serviceSubnet: {{ kube_service_addresses }}
...
@@ -29,12 +28,6 @@ kubeProxy:
...
@@ -29,12 +28,6 @@ kubeProxy:
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
{% if kube_proxy_mode == 'ipvs' and kube_version | version_compare('v1.10', '<') %}
featureGates: SupportIPVSProxyMode=true
featureGates: SupportIPVSProxyMode=true
mode: ipvs
mode: ipvs
{% elif kube_proxy_mode == 'ipvs' %}
kubeProxy:
config:
featureGates:
SupportIPVSProxyMode: true
mode: ipvs
{% endif %}
{% endif %}
{% if kube_proxy_nodeport_addresses %}
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment