diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp index 0b3de7e82..ba2565788 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -2142,7 +2142,6 @@ class platform::kubernetes::dual_stack::ipv4::runtime { logoutput => true, } if $state == true { - $ipip_mode = 'Always' file { $def_pool_filename: ensure => file, content => template('platform/callico_ippool.yaml.erb'), @@ -2224,7 +2223,6 @@ class platform::kubernetes::dual_stack::ipv6::runtime { logoutput => true, } if $state == true { - $ipip_mode = 'Never' file { $def_pool_filename: ensure => file, content => template('platform/callico_ippool.yaml.erb'), diff --git a/puppet-manifests/src/modules/platform/templates/callico_ippool.yaml.erb b/puppet-manifests/src/modules/platform/templates/callico_ippool.yaml.erb index 2af7c2bbf..01a2e3cb8 100644 --- a/puppet-manifests/src/modules/platform/templates/callico_ippool.yaml.erb +++ b/puppet-manifests/src/modules/platform/templates/callico_ippool.yaml.erb @@ -6,6 +6,6 @@ metadata: name: default-<%= @protocol %>-ippool spec: cidr: <%= @pod_sec_subnet %> - ipipMode: <%= @ipip_mode %> + ipipMode: Never natOutgoing: true vxlanMode: Never