Merge pull request #12286 from zetaab/fixcrossubnet

use ipip Always by default in OpenStack
kubernetes · Sep 7, 2021 · 8dee92b · 8dee92b
2 parents ebd0602 + bb35842
commit 8dee92b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -171,6 +171,9 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS
 			if c.IPIPMode != "" {
 				return c.IPIPMode
 			}
+			if kops.CloudProviderID(cluster.Spec.CloudProvider) == kops.CloudProviderOpenstack {
+				return "Always"
+			}
 			return "CrossSubnet"
 		}
 		dest["CalicoIPv4PoolVXLANMode"] = func() string {