External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 09:57:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

control-plane: refactor group membership test

Browse Source 
Testing with group_names does not require the groups to exist.
This commit is contained in:
Max Gautier
2024-09-23 16:09:07 +02:00
parent 0679d9c8e9
commit fbcc8cc336
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
View File

@@ -16,7 +16,7 @@ nodeRegistration:
{% if kube_override_hostname | default('') %} {% if kube_override_hostname | default('') %}
name: "{{ kube_override_hostname }}" name: "{{ kube_override_hostname }}"
{% endif %} {% endif %}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %} {% if 'kube_control_plane' in group_names and 'kube_node' not in group_names %}
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane

2
roles/kubernetes/control-plane/templates/kubeadm-controlplane.v1beta3.yaml.j2
View File

@@ -24,7 +24,7 @@ controlPlane:
nodeRegistration: nodeRegistration:
name: {{ kube_override_hostname | default(inventory_hostname) }} name: {{ kube_override_hostname | default(inventory_hostname) }}
criSocket: {{ cri_socket }} criSocket: {{ cri_socket }}
{% if inventory_hostname in groups['kube_control_plane'] and inventory_hostname not in groups['kube_node'] %} {% if 'kube_control_plane' in group_names and 'kube_node' not in group_names %}
taints: taints:
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/control-plane key: node-role.kubernetes.io/control-plane