Merge pull request #9782 from hakman/ignore-flannel-workaround

Ignore the disableTxChecksumOffloading flag for Flannel and Canal

k8s/crds/kops.k8s.io_clusters.yaml

@@ -2804,6 +2804,10 @@ spec:
                           to NOT add the default ACCEPT traffic rules to the iptables
                           FORWARD chain
                         type: boolean
+                      disableTxChecksumOffloading:
+                        description: DisableTxChecksumOffloading is deprecated as
+                          of kops 1.19 and has no effect
+                        type: boolean
                       iptablesBackend:
                         description: 'IptablesBackend controls which variant of iptables
                           binary Felix uses Default: Auto (other options: Legacy,
@@ -3230,6 +3234,10 @@ spec:
                         description: Backend is the backend overlay type we want to
                           use (vxlan or udp)
                         type: string
+                      disableTxChecksumOffloading:
+                        description: DisableTxChecksumOffloading is deprecated as
+                          of kops 1.19 and has no effect
+                        type: boolean
                       iptablesResyncSeconds:
                         description: IptablesResyncSeconds sets resync period for
                           iptables rules, in seconds

pkg/apis/kops/networking.go

@@ -92,6 +92,8 @@ type WeaveNetworkingSpec struct {
 type FlannelNetworkingSpec struct {
 	// Backend is the backend overlay type we want to use (vxlan or udp)
 	Backend string `json:"backend,omitempty"`
+	// DisableTxChecksumOffloading is deprecated as of kops 1.19 and has no effect
+	DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"`
 	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
 	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
 }
@@ -160,6 +162,8 @@ type CanalNetworkingSpec struct {
 	// DisableFlannelForwardRules configures Flannel to NOT add the
 	// default ACCEPT traffic rules to the iptables FORWARD chain
 	DisableFlannelForwardRules bool `json:"disableFlannelForwardRules,omitempty"`
+	// DisableTxChecksumOffloading is deprecated as of kops 1.19 and has no effect
+	DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"`
 	// IptablesBackend controls which variant of iptables binary Felix uses
 	// Default: Auto (other options: Legacy, NFT)
 	IptablesBackend string `json:"iptablesBackend,omitempty"`

pkg/apis/kops/v1alpha2/networking.go

@@ -92,6 +92,8 @@ type WeaveNetworkingSpec struct {
 type FlannelNetworkingSpec struct {
 	// Backend is the backend overlay type we want to use (vxlan or udp)
 	Backend string `json:"backend,omitempty"`
+	// DisableTxChecksumOffloading is deprecated as of kops 1.19 and has no effect
+	DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"`
 	// IptablesResyncSeconds sets resync period for iptables rules, in seconds
 	IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"`
 }
@@ -160,6 +162,8 @@ type CanalNetworkingSpec struct {
 	// DisableFlannelForwardRules configures Flannel to NOT add the
 	// default ACCEPT traffic rules to the iptables FORWARD chain
 	DisableFlannelForwardRules bool `json:"disableFlannelForwardRules,omitempty"`
+	// DisableTxChecksumOffloading is deprecated as of kops 1.19 and has no effect
+	DisableTxChecksumOffloading bool `json:"disableTxChecksumOffloading,omitempty"`
 	// IptablesBackend controls which variant of iptables binary Felix uses
 	// Default: Auto (other options: Legacy, NFT)
 	IptablesBackend string `json:"iptablesBackend,omitempty"`

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

@@ -1349,6 +1349,7 @@ func autoConvert_v1alpha2_CanalNetworkingSpec_To_kops_CanalNetworkingSpec(in *Ca
 	out.CPURequest = in.CPURequest
 	out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction
 	out.DisableFlannelForwardRules = in.DisableFlannelForwardRules
+	out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
 	out.IptablesBackend = in.IptablesBackend
 	out.LogSeveritySys = in.LogSeveritySys
 	out.MTU = in.MTU
@@ -1372,6 +1373,7 @@ func autoConvert_kops_CanalNetworkingSpec_To_v1alpha2_CanalNetworkingSpec(in *ko
 	out.CPURequest = in.CPURequest
 	out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction
 	out.DisableFlannelForwardRules = in.DisableFlannelForwardRules
+	out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
 	out.IptablesBackend = in.IptablesBackend
 	out.LogSeveritySys = in.LogSeveritySys
 	out.MTU = in.MTU
@@ -2990,6 +2992,7 @@ func Convert_kops_FileAssetSpec_To_v1alpha2_FileAssetSpec(in *kops.FileAssetSpec
 
 func autoConvert_v1alpha2_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *FlannelNetworkingSpec, out *kops.FlannelNetworkingSpec, s conversion.Scope) error {
 	out.Backend = in.Backend
+	out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
 	out.IptablesResyncSeconds = in.IptablesResyncSeconds
 	return nil
 }
@@ -3001,6 +3004,7 @@ func Convert_v1alpha2_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *Fl
 
 func autoConvert_kops_FlannelNetworkingSpec_To_v1alpha2_FlannelNetworkingSpec(in *kops.FlannelNetworkingSpec, out *FlannelNetworkingSpec, s conversion.Scope) error {
 	out.Backend = in.Backend
+	out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
 	out.IptablesResyncSeconds = in.IptablesResyncSeconds
 	return nil
 }