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
95b8ac5f
Commit
95b8ac5f
authored
7 years ago
by
Maxim Krasilnikov
Committed by
Matthew Mosesohn
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added optional controller and scheduler extra args to kubeadm config (#2205)
parent
bd1f0bcf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/master/defaults/main.yml
+4
-1
4 additions, 1 deletion
roles/kubernetes/master/defaults/main.yml
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
+9
-0
9 additions, 0 deletions
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
with
13 additions
and
1 deletion
roles/kubernetes/master/defaults/main.yml
+
4
−
1
View file @
95b8ac5f
...
...
@@ -83,8 +83,11 @@ controller_mgr_custom_flags: []
scheduler_custom_flags
:
[]
# kubeadm settings
# Value of 0 means it never expires
#
# Value of 0 means it never expires
kubeadm_token_ttl
:
0
## Extra args for k8s components passing by kubeadm
kube_kubeadm_controller_extra_args
:
{}
kube_kubeadm_scheduler_extra_args
:
{}
## Variable for influencing kube-scheduler behaviour
volume_cross_zone_attachment
:
false
This diff is collapsed.
Click to expand it.
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
+
9
−
0
View file @
95b8ac5f
...
...
@@ -67,6 +67,15 @@ controllerManagerExtraArgs:
{% if kube_feature_gates %}
feature-gates: {{ kube_feature_gates|join(',') }}
{% endif %}
{% for key in kube_kubeadm_controller_extra_args %}
{{ key }}: {{ kube_kubeadm_controller_extra_args[key] }}
{% endfor %}
{% if kube_kubeadm_scheduler_extra_args|length > 0 %}
schedulerExtraArgs:
{% for key in kube_kubeadm_scheduler_extra_args %}
{{ key }}: {{ kube_kubeadm_scheduler_extra_args[key] }}
{% endfor %}
{% endif %}
apiServerCertSANs:
{% for san in apiserver_sans.split(' ') | unique %}
- {{ san }}
...
...
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