kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Ignore the disableTxChecksumOffloading flag for Flannel and Canal
This commit is contained in:
Kubernetes Prow Robot 2020-08-21 04:47:40 -07:00 committed by GitHub
parent d617f98c07 68474f7793
commit 076df5ec84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
k8s/crds/kops.k8s.io_clusters.yaml
View File

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

4
pkg/apis/kops/networking.go
View File

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

4
pkg/apis/kops/v1alpha2/networking.go
View File

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

4
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -1349,6 +1349,7 @@ func autoConvert_v1alpha2_CanalNetworkingSpec_To_kops_CanalNetworkingSpec(in *Ca
out.CPURequest = in.CPURequest out.CPURequest = in.CPURequest
out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction
out.DisableFlannelForwardRules = in.DisableFlannelForwardRules out.DisableFlannelForwardRules = in.DisableFlannelForwardRules
out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
out.IptablesBackend = in.IptablesBackend out.IptablesBackend = in.IptablesBackend
out.LogSeveritySys = in.LogSeveritySys out.LogSeveritySys = in.LogSeveritySys
out.MTU = in.MTU out.MTU = in.MTU
@ -1372,6 +1373,7 @@ func autoConvert_kops_CanalNetworkingSpec_To_v1alpha2_CanalNetworkingSpec(in *ko
out.CPURequest = in.CPURequest out.CPURequest = in.CPURequest
out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction out.DefaultEndpointToHostAction = in.DefaultEndpointToHostAction
out.DisableFlannelForwardRules = in.DisableFlannelForwardRules out.DisableFlannelForwardRules = in.DisableFlannelForwardRules
out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
out.IptablesBackend = in.IptablesBackend out.IptablesBackend = in.IptablesBackend
out.LogSeveritySys = in.LogSeveritySys out.LogSeveritySys = in.LogSeveritySys
out.MTU = in.MTU 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 { func autoConvert_v1alpha2_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *FlannelNetworkingSpec, out *kops.FlannelNetworkingSpec, s conversion.Scope) error {
out.Backend = in.Backend out.Backend = in.Backend
out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
out.IptablesResyncSeconds = in.IptablesResyncSeconds out.IptablesResyncSeconds = in.IptablesResyncSeconds
return nil 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 { func autoConvert_kops_FlannelNetworkingSpec_To_v1alpha2_FlannelNetworkingSpec(in *kops.FlannelNetworkingSpec, out *FlannelNetworkingSpec, s conversion.Scope) error {
out.Backend = in.Backend out.Backend = in.Backend
out.DisableTxChecksumOffloading = in.DisableTxChecksumOffloading
out.IptablesResyncSeconds = in.IptablesResyncSeconds out.IptablesResyncSeconds = in.IptablesResyncSeconds
return nil return nil
} }