Remove workaround as k3s is now at 1.26
This commit is contained in:
		
							parent
							
								
									550f6868ff
								
							
						
					
					
						commit
						c1c7ec9e56
					
				@ -3,9 +3,6 @@ token: '{{ kubernetes.token }}'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
{% if nodeip_ipv6 != "" and kubernetes.ipPool.ipv6 is defined %}
 | 
					{% if nodeip_ipv6 != "" and kubernetes.ipPool.ipv6 is defined %}
 | 
				
			||||||
node-ip: {{ nodeip_ipv4 }},{{ nodeip_ipv6 }} 
 | 
					node-ip: {{ nodeip_ipv4 }},{{ nodeip_ipv6 }} 
 | 
				
			||||||
 | 
					 | 
				
			||||||
# FIXME: Workaround for bug in Kubernetes 1.24/1.25 ignoring node IPv6 addresses
 | 
					 | 
				
			||||||
kubelet-arg: "--node-ip=0.0.0.0"
 | 
					 | 
				
			||||||
{% else %}
 | 
					{% else %}
 | 
				
			||||||
node-ip: {{ nodeip_ipv4 }}
 | 
					node-ip: {{ nodeip_ipv4 }}
 | 
				
			||||||
{% endif %}
 | 
					{% endif %}
 | 
				
			||||||
 | 
				
			|||||||
@ -15,9 +15,6 @@ tls-san:
 | 
				
			|||||||
node-ip: {{ nodeip_ipv4 }},{{ nodeip_ipv6 }}
 | 
					node-ip: {{ nodeip_ipv4 }},{{ nodeip_ipv6 }}
 | 
				
			||||||
cluster-cidr: {{ kubernetes.ipPool.ipv4.cluster_cidr }},{{ kubernetes.ipPool.ipv6.cluster_cidr }}
 | 
					cluster-cidr: {{ kubernetes.ipPool.ipv4.cluster_cidr }},{{ kubernetes.ipPool.ipv6.cluster_cidr }}
 | 
				
			||||||
service-cidr: {{ kubernetes.ipPool.ipv4.service_cidr }},{{ kubernetes.ipPool.ipv6.service_cidr }}  
 | 
					service-cidr: {{ kubernetes.ipPool.ipv4.service_cidr }},{{ kubernetes.ipPool.ipv6.service_cidr }}  
 | 
				
			||||||
 | 
					 | 
				
			||||||
# FIXME: Workaround for bug in Kubernetes 1.24/1.25 ignoring node IPv6 addresses
 | 
					 | 
				
			||||||
kubelet-arg: "--node-ip=0.0.0.0"
 | 
					 | 
				
			||||||
{% else %}
 | 
					{% else %}
 | 
				
			||||||
node-ip: {{ nodeip_ipv4 }}
 | 
					node-ip: {{ nodeip_ipv4 }}
 | 
				
			||||||
cluster-cidr: {{ kubernetes.ipPool.ipv4.cluster_cidr }}
 | 
					cluster-cidr: {{ kubernetes.ipPool.ipv4.cluster_cidr }}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user