starlingx/stx-puppet
Code Issues Proposed changes

Merge "Disable IPIP tunnel in Calico"

Browse Source
This commit is contained in:
Zuul 2024-07-26 13:45:17 +00:00 committed by Gerrit Code Review
commit 1bbba75b3a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/src/modules/platform/manifests/kubernetes.pp
View File

@ -2142,7 +2142,6 @@ class platform::kubernetes::dual_stack::ipv4::runtime {
logoutput => true, logoutput => true,
} }
if $state == true { if $state == true {
$ipip_mode = 'Always'
file { $def_pool_filename: file { $def_pool_filename:
ensure => file, ensure => file,
content => template('platform/callico_ippool.yaml.erb'), content => template('platform/callico_ippool.yaml.erb'),
@ -2224,7 +2223,6 @@ class platform::kubernetes::dual_stack::ipv6::runtime {
logoutput => true, logoutput => true,
} }
if $state == true { if $state == true {
$ipip_mode = 'Never'
file { $def_pool_filename: file { $def_pool_filename:
ensure => file, ensure => file,
content => template('platform/callico_ippool.yaml.erb'), content => template('platform/callico_ippool.yaml.erb'),

2
puppet-manifests/src/modules/platform/templates/callico_ippool.yaml.erb
View File

@ -6,6 +6,6 @@ metadata:
name: default-<%= @protocol %>-ippool name: default-<%= @protocol %>-ippool
spec: spec:
cidr: <%= @pod_sec_subnet %> cidr: <%= @pod_sec_subnet %>
ipipMode: <%= @ipip_mode %> ipipMode: Never
natOutgoing: true natOutgoing: true
vxlanMode: Never vxlanMode: Never