Expose EnableNFTables in flannel config

Author: rifelpet

pkg/apis/kops/networking.go

@@ -173,6 +173,8 @@ type FlannelNetworkingSpec struct {
 	Backend string `json:"backend,omitempty"`
 	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
 	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
+	// EnableNFTables makes flannel use nftables instead of iptables.
+	EnableNFTables bool `json:"enableNFTables,omitempty"`
 }
 
 // CalicoNetworkingSpec declares that we want Calico networking

pkg/apis/kops/v1alpha2/networking.go

@@ -128,6 +128,8 @@ type FlannelNetworkingSpec struct {
 	DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"`
 	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
 	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
+	// EnableNFTables makes flannel use nftables instead of iptables.
+	EnableNFTables bool `json:"enableNFTables,omitempty"`
 }
 
 // CalicoNetworkingSpec declares that we want Calico networking

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -137,6 +137,8 @@ type FlannelNetworkingSpec struct {
 	Backend string `json:"backend,omitempty"`
 	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
 	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
+	// EnableNFTables makes flannel use nftables instead of iptables.
+	EnableNFTables bool `json:"enableNFTables,omitempty"`
 }
 
 // CalicoNetworkingSpec declares that we want Calico networking

pkg/apis/kops/v1alpha3/networking.go

@@ -92,7 +92,7 @@ data:
   net-conf.json: |
     {
       "Network": "{{ .Networking.NonMasqueradeCIDR }}",
-      "EnableNFTables": false,
+      "EnableNFTables": {{ .Networking.Flannel.EnableNFTables }},
       "Backend": {
         "Type": "{{ FlannelBackendType }}"
       }