epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-13 21:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify collection of SubjectAlternativeNames for apiserver (#12507)

Browse Source 
Remove a bunch of intermediate variables, which fixes a
"'UndefinedMarker' concatenation" error in ansible-lint v25.8.1.
This commit is contained in:
Max Gautier
2025-12-04 10:06:57 +00:00
committed by GitHub
parent 2342d0cd57
commit 4d87ac1032
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
roles/kubernetes/control-plane/tasks/kubeadm-setup.yml
View File

@@ -25,9 +25,9 @@
- name: Kubeadm | aggregate all SANs - name: Kubeadm | aggregate all SANs
set_fact: set_fact:
apiserver_sans: "{{ (sans_base + groups['kube_control_plane'] + sans_lb + sans_lb_ip + sans_supp + sans_access_ip + sans_ip + sans_ipv4_address + sans_ipv6_address + sans_override + sans_hostname + sans_fqdn + sans_kube_vip_address) | unique }}" apiserver_sans: "{{ _apiserver_sans | flatten | select | unique }}"
vars: vars:
sans_base: _apiserver_sans:
- "kubernetes" - "kubernetes"
- "kubernetes.default" - "kubernetes.default"
- "kubernetes.default.svc" - "kubernetes.default.svc"
@@ -36,17 +36,17 @@
- "localhost" - "localhost"
- "127.0.0.1" - "127.0.0.1"
- "::1" - "::1"
sans_lb: "{{ [apiserver_loadbalancer_domain_name] if apiserver_loadbalancer_domain_name is defined else [] }}" - "{{ apiserver_loadbalancer_domain_name }}"
sans_lb_ip: "{{ [loadbalancer_apiserver.address] if loadbalancer_apiserver is defined and loadbalancer_apiserver.address is defined else [] }}" - "{{ loadbalancer_apiserver.address | d('') }}"
sans_supp: "{{ supplementary_addresses_in_ssl_keys if supplementary_addresses_in_ssl_keys is defined else [] }}" - "{{ supplementary_addresses_in_ssl_keys | d([]) }}"
sans_access_ip: "{{ groups['kube_control_plane'] | map('extract', hostvars, 'main_access_ip') | list | select('defined') | list }}" - "{{ groups['kube_control_plane'] | map('extract', hostvars, 'main_access_ip') }}"
sans_ip: "{{ groups['kube_control_plane'] | map('extract', hostvars, 'main_ip') | list | select('defined') | list }}" - "{{ groups['kube_control_plane'] | map('extract', hostvars, 'main_ip') }}"
sans_ipv4_address: "{{ groups['kube_control_plane'] | map('extract', hostvars, ['ansible_default_ipv4', 'address']) | list | select('defined') | list }}" - "{{ groups['kube_control_plane'] | map('extract', hostvars, ['ansible_default_ipv4', 'address']) | select('defined') }}"
sans_ipv6_address: "{{ groups['kube_control_plane'] | map('extract', hostvars, ['ansible_default_ipv6', 'address']) | list | select('defined') | list }}" - "{{ groups['kube_control_plane'] | map('extract', hostvars, ['ansible_default_ipv6', 'address']) | select('defined') }}"
sans_override: "{{ [kube_override_hostname] if kube_override_hostname else [] }}" - "{{ groups['kube_control_plane'] | map('extract', hostvars, 'ansible_hostname') }}"
sans_hostname: "{{ groups['kube_control_plane'] | map('extract', hostvars, ['ansible_hostname']) | list | select('defined') | list }}" - "{{ groups['kube_control_plane'] | map('extract', hostvars, 'ansible_fqdn') }}"
sans_fqdn: "{{ groups['kube_control_plane'] | map('extract', hostvars, ['ansible_fqdn']) | list | select('defined') | list }}" - "{{ kube_override_hostname }}"
sans_kube_vip_address: "{{ [kube_vip_address] if kube_vip_address is defined and kube_vip_address else [] }}" - "{{ kube_vip_address }}"
tags: facts tags: facts
- name: Create audit-policy directory - name: Create audit-policy directory

1
roles/kubernetes/node/defaults/main.yml
View File

@@ -80,7 +80,6 @@ kube_vip_bgp_peeraddress:
kube_vip_bgp_peerpass: kube_vip_bgp_peerpass:
kube_vip_bgp_peeras: 65000 kube_vip_bgp_peeras: 65000
kube_vip_bgppeers: kube_vip_bgppeers:
kube_vip_address:
kube_vip_enableServicesElection: false kube_vip_enableServicesElection: false
kube_vip_lb_enable: false kube_vip_lb_enable: false
kube_vip_leasename: plndr-cp-lock kube_vip_leasename: plndr-cp-lock

1
roles/kubespray_defaults/defaults/main/main.yml
View File

@@ -96,6 +96,7 @@ ignore_assert_errors: false
# kube-vip # kube-vip
kube_vip_enabled: false kube_vip_enabled: false
kube_vip_lb_fwdmethod: local kube_vip_lb_fwdmethod: local
kube_vip_address:
# nginx-proxy configure # nginx-proxy configure
nginx_config_dir: "/etc/nginx" nginx_config_dir: "/etc/nginx"