diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go index 9f1e0265d2..25d588f9ad 100644 --- a/pkg/apis/kops/networking.go +++ b/pkg/apis/kops/networking.go @@ -69,6 +69,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"` + // IptablesResyncSeconds sets resync period for iptables rules, in seconds + IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"` } // CalicoNetworkingSpec declares that we want Calico networking diff --git a/pkg/apis/kops/v1alpha1/networking.go b/pkg/apis/kops/v1alpha1/networking.go index 469e3651e5..bfbbe1aa48 100644 --- a/pkg/apis/kops/v1alpha1/networking.go +++ b/pkg/apis/kops/v1alpha1/networking.go @@ -69,6 +69,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"` + // IptablesResyncSeconds sets resync period for iptables rules, in seconds + IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"` } // CalicoNetworkingSpec declares that we want Calico networking diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index c95bf479be..3aefdb7854 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -2413,6 +2413,7 @@ func Convert_kops_FileAssetSpec_To_v1alpha1_FileAssetSpec(in *kops.FileAssetSpec func autoConvert_v1alpha1_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *FlannelNetworkingSpec, out *kops.FlannelNetworkingSpec, s conversion.Scope) error { out.Backend = in.Backend + out.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } @@ -2423,6 +2424,7 @@ func Convert_v1alpha1_FlannelNetworkingSpec_To_kops_FlannelNetworkingSpec(in *Fl func autoConvert_kops_FlannelNetworkingSpec_To_v1alpha1_FlannelNetworkingSpec(in *kops.FlannelNetworkingSpec, out *FlannelNetworkingSpec, s conversion.Scope) error { out.Backend = in.Backend + out.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go index f955b0c539..44f3374e13 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go @@ -1207,6 +1207,11 @@ func (in *FileAssetSpec) DeepCopy() *FileAssetSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FlannelNetworkingSpec) DeepCopyInto(out *FlannelNetworkingSpec) { *out = *in + if in.IptablesResyncSeconds != nil { + in, out := &in.IptablesResyncSeconds, &out.IptablesResyncSeconds + *out = new(int32) + **out = **in + } return } @@ -2503,7 +2508,7 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { if in.Flannel != nil { in, out := &in.Flannel, &out.Flannel *out = new(FlannelNetworkingSpec) - **out = **in + (*in).DeepCopyInto(*out) } if in.Calico != nil { in, out := &in.Calico, &out.Calico diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go index e617fee3a9..6d7d180f8e 100644 --- a/pkg/apis/kops/v1alpha2/networking.go +++ b/pkg/apis/kops/v1alpha2/networking.go @@ -69,6 +69,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"` + // IptablesResyncSeconds sets resync period for iptables rules, in seconds + IptablesResyncSeconds *int32 `json:"iptablesResyncSeconds,omitempty"` } // CalicoNetworkingSpec declares that we want Calico networking diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index f73fd006d1..dfcabda06a 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -2530,6 +2530,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.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } @@ -2540,6 +2541,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.IptablesResyncSeconds = in.IptablesResyncSeconds return nil } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 4def0f107d..639f68ba5a 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -1164,6 +1164,11 @@ func (in *FileAssetSpec) DeepCopy() *FileAssetSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FlannelNetworkingSpec) DeepCopyInto(out *FlannelNetworkingSpec) { *out = *in + if in.IptablesResyncSeconds != nil { + in, out := &in.IptablesResyncSeconds, &out.IptablesResyncSeconds + *out = new(int32) + **out = **in + } return } @@ -2574,7 +2579,7 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { if in.Flannel != nil { in, out := &in.Flannel, &out.Flannel *out = new(FlannelNetworkingSpec) - **out = **in + (*in).DeepCopyInto(*out) } if in.Calico != nil { in, out := &in.Calico, &out.Calico diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 43b0581de4..2f05bab6af 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -1330,6 +1330,11 @@ func (in *FileAssetSpec) DeepCopy() *FileAssetSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *FlannelNetworkingSpec) DeepCopyInto(out *FlannelNetworkingSpec) { *out = *in + if in.IptablesResyncSeconds != nil { + in, out := &in.IptablesResyncSeconds, &out.IptablesResyncSeconds + *out = new(int32) + **out = **in + } return } @@ -2772,7 +2777,7 @@ func (in *NetworkingSpec) DeepCopyInto(out *NetworkingSpec) { if in.Flannel != nil { in, out := &in.Flannel, &out.Flannel *out = new(FlannelNetworkingSpec) - **out = **in + (*in).DeepCopyInto(*out) } if in.Calico != nil { in, out := &in.Calico, &out.Calico