C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Renamed variable from disable_volume_zone_conflict to volume_cross_zone_attachment and removed cloud provider condition; fix identation

Browse source
This commit is contained in:
Virgil Chereches 2018-01-23 13:14:00 +00:00
parent 3125f93b3f
commit a4d142368b
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/k8s-cluster.yml
View file

@ -183,4 +183,4 @@ local_volumes_enabled: false
## Running on top of openstack vms with cinder enabled may lead to unschedulable pods due to NoVolumeZoneConflict restriction in kube-scheduler. ## Running on top of openstack vms with cinder enabled may lead to unschedulable pods due to NoVolumeZoneConflict restriction in kube-scheduler.
## See https://github.com/kubernetes-incubator/kubespray/issues/2141 ## See https://github.com/kubernetes-incubator/kubespray/issues/2141
## Set this variable to true to get rid of this issue ## Set this variable to true to get rid of this issue
disable_volume_zone_conflict: false volume_cross_zone_attachment: false

2
roles/kubernetes/master/defaults/main.yml
View file

@ -82,4 +82,4 @@ scheduler_custom_flags: []
kubeadm_token_ttl: 0 kubeadm_token_ttl: 0
## Variable for influencing kube-scheduler behaviour ## Variable for influencing kube-scheduler behaviour
disable_volume_zone_conflict: false volume_cross_zone_attachment: false

4
roles/kubernetes/master/tasks/static-pod-setup.yml
View file

@ -11,8 +11,8 @@
- name: Write kube-scheduler policy file - name: Write kube-scheduler policy file
template: template:
src: kube-scheduler-policy.yaml.j2 src: kube-scheduler-policy.yaml.j2
dest: "{{ kube_config_dir }}/kube-scheduler-policy.yaml" dest: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"
tags: tags:
- kube-scheduler - kube-scheduler

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

@ -28,7 +28,7 @@ spec:
- scheduler - scheduler
- --leader-elect=true - --leader-elect=true
- --kubeconfig={{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml - --kubeconfig={{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml
{% if cloud_provider == 'openstack' and disable_volume_zone_conflict %} {% if volume_cross_zone_attachment %}
- --policy-config-file={{ kube_config_dir }}/kube-scheduler-policy.yaml - --policy-config-file={{ kube_config_dir }}/kube-scheduler-policy.yaml
{% endif %} {% endif %}
- --profiling=false - --profiling=false
@ -65,7 +65,7 @@ spec:
- mountPath: "{{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml" - mountPath: "{{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml"
name: kubeconfig name: kubeconfig
readOnly: true readOnly: true
{% if cloud_provider == 'openstack' and disable_volume_zone_conflict %} {% if volume_cross_zone_attachment %}
- mountPath: "{{ kube_config_dir }}/kube-scheduler-policy.yaml" - mountPath: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"
name: kube-scheduler-policy name: kube-scheduler-policy
readOnly: true readOnly: true
@ -85,7 +85,7 @@ spec:
- name: kubeconfig - name: kubeconfig
hostPath: hostPath:
path: "{{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml" path: "{{ kube_config_dir }}/kube-scheduler-kubeconfig.yaml"
{% if cloud_provider == 'openstack' and disable_volume_zone_conflict %} {% if volume_cross_zone_attachment %}
- name: kube-scheduler-policy - name: kube-scheduler-policy
hostPath: hostPath:
path: "{{ kube_config_dir }}/kube-scheduler-policy.yaml" path: "{{ kube_config_dir }}/kube-scheduler-policy.yaml"