github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Update generated componentconfig from adding minimum iptables sync to the proxy

Browse Source
This commit is contained in:
Timothy St. Clair 2016-10-21 05:51:02 -05:00
parent 2b012e822a
commit 1cb97b83ca
6 changed files with 18 additions and 12565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/componentconfig/v1alpha1/zz_generated.conversion.go
View File

@ -68,6 +68,7 @@ func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyCon
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.IPTablesMasqueradeBit = (*int32)(unsafe.Pointer(in.IPTablesMasqueradeBit)) out.IPTablesMasqueradeBit = (*int32)(unsafe.Pointer(in.IPTablesMasqueradeBit))
out.IPTablesSyncPeriod = in.IPTablesSyncPeriod out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod
out.KubeconfigPath = in.KubeconfigPath out.KubeconfigPath = in.KubeconfigPath
out.MasqueradeAll = in.MasqueradeAll out.MasqueradeAll = in.MasqueradeAll
out.Master = in.Master out.Master = in.Master
@ -96,6 +97,7 @@ func autoConvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyCon
out.HostnameOverride = in.HostnameOverride out.HostnameOverride = in.HostnameOverride
out.IPTablesMasqueradeBit = (*int32)(unsafe.Pointer(in.IPTablesMasqueradeBit)) out.IPTablesMasqueradeBit = (*int32)(unsafe.Pointer(in.IPTablesMasqueradeBit))
out.IPTablesSyncPeriod = in.IPTablesSyncPeriod out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod
out.KubeconfigPath = in.KubeconfigPath out.KubeconfigPath = in.KubeconfigPath
out.MasqueradeAll = in.MasqueradeAll out.MasqueradeAll = in.MasqueradeAll
out.Master = in.Master out.Master = in.Master

1
pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
View File

@ -65,6 +65,7 @@ func DeepCopy_v1alpha1_KubeProxyConfiguration(in interface{}, out interface{}, c
out.IPTablesMasqueradeBit = nil out.IPTablesMasqueradeBit = nil
} }
out.IPTablesSyncPeriod = in.IPTablesSyncPeriod out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod
out.KubeconfigPath = in.KubeconfigPath out.KubeconfigPath = in.KubeconfigPath
out.MasqueradeAll = in.MasqueradeAll out.MasqueradeAll = in.MasqueradeAll
out.Master = in.Master out.Master = in.Master

1
pkg/apis/componentconfig/zz_generated.deepcopy.go
View File

@ -153,6 +153,7 @@ func DeepCopy_componentconfig_KubeProxyConfiguration(in interface{}, out interfa
out.IPTablesMasqueradeBit = nil out.IPTablesMasqueradeBit = nil
} }
out.IPTablesSyncPeriod = in.IPTablesSyncPeriod out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
out.IPTablesMinSyncPeriod = in.IPTablesMinSyncPeriod
out.KubeconfigPath = in.KubeconfigPath out.KubeconfigPath = in.KubeconfigPath
out.MasqueradeAll = in.MasqueradeAll out.MasqueradeAll = in.MasqueradeAll
out.Master = in.Master out.Master = in.Master

16
pkg/generated/openapi/zz_generated.openapi.go
View File

@ -1911,6 +1911,12 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"),
}, },
}, },
"iptablesMinSyncPeriodSeconds": {
SchemaProps: spec.SchemaProps{
Description: "iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0.",
Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"),
},
},
"kubeconfigPath": { "kubeconfigPath": {
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Description: "kubeconfigPath is the path to the kubeconfig file with authorization information (the master location is set by the master flag).", Description: "kubeconfigPath is the path to the kubeconfig file with authorization information (the master location is set by the master flag).",
@ -2000,7 +2006,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
}, },
}, },
}, },
Required: []string{"TypeMeta", "bindAddress", "clusterCIDR", "healthzBindAddress", "healthzPort", "hostnameOverride", "iptablesMasqueradeBit", "iptablesSyncPeriodSeconds", "kubeconfigPath", "masqueradeAll", "master", "oomScoreAdj", "mode", "portRange", "resourceContainer", "udpTimeoutMilliseconds", "conntrackMax", "conntrackMaxPerCore", "conntrackMin", "conntrackTCPEstablishedTimeout", "conntrackTCPCloseWaitTimeout"}, Required: []string{"TypeMeta", "bindAddress", "clusterCIDR", "healthzBindAddress", "healthzPort", "hostnameOverride", "iptablesMasqueradeBit", "iptablesSyncPeriodSeconds", "iptablesMinSyncPeriodSeconds", "kubeconfigPath", "masqueradeAll", "master", "oomScoreAdj", "mode", "portRange", "resourceContainer", "udpTimeoutMilliseconds", "conntrackMax", "conntrackMaxPerCore", "conntrackMin", "conntrackTCPEstablishedTimeout", "conntrackTCPCloseWaitTimeout"},
}, },
}, },
Dependencies: []string{ Dependencies: []string{
@ -13645,6 +13651,12 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"), Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"),
}, },
}, },
"iptablesMinSyncPeriodSeconds": {
SchemaProps: spec.SchemaProps{
Description: "iptablesMinSyncPeriod is the minimum period that iptables rules are refreshed (e.g. '5s', '1m', '2h22m'). Must be greater than 0.",
Ref: spec.MustCreateRef("#/definitions/unversioned.Duration"),
},
},
"kubeconfigPath": { "kubeconfigPath": {
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Description: "kubeconfigPath is the path to the kubeconfig file with authorization information (the master location is set by the master flag).", Description: "kubeconfigPath is the path to the kubeconfig file with authorization information (the master location is set by the master flag).",
@ -13734,7 +13746,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
}, },
}, },
}, },
Required: []string{"TypeMeta", "bindAddress", "clusterCIDR", "healthzBindAddress", "healthzPort", "hostnameOverride", "iptablesMasqueradeBit", "iptablesSyncPeriodSeconds", "kubeconfigPath", "masqueradeAll", "master", "oomScoreAdj", "mode", "portRange", "resourceContainer", "udpTimeoutMilliseconds", "conntrackMax", "conntrackMaxPerCore", "conntrackMin", "conntrackTCPEstablishedTimeout", "conntrackTCPCloseWaitTimeout"}, Required: []string{"TypeMeta", "bindAddress", "clusterCIDR", "healthzBindAddress", "healthzPort", "hostnameOverride", "iptablesMasqueradeBit", "iptablesSyncPeriodSeconds", "iptablesMinSyncPeriodSeconds", "kubeconfigPath", "masqueradeAll", "master", "oomScoreAdj", "mode", "portRange", "resourceContainer", "udpTimeoutMilliseconds", "conntrackMax", "conntrackMaxPerCore", "conntrackMin", "conntrackTCPEstablishedTimeout", "conntrackTCPCloseWaitTimeout"},
}, },
}, },
Dependencies: []string{ Dependencies: []string{

12561
staging/src/k8s.io/client-go/pkg/apis/componentconfig/types.generated.go
View File

File diff suppressed because it is too large Load Diff

2
vendor/BUILD vendored
View File

@ -9870,13 +9870,11 @@ go_library(
"k8s.io/client-go/pkg/apis/componentconfig/doc.go", "k8s.io/client-go/pkg/apis/componentconfig/doc.go",
"k8s.io/client-go/pkg/apis/componentconfig/helpers.go", "k8s.io/client-go/pkg/apis/componentconfig/helpers.go",
"k8s.io/client-go/pkg/apis/componentconfig/register.go", "k8s.io/client-go/pkg/apis/componentconfig/register.go",
"k8s.io/client-go/pkg/apis/componentconfig/types.generated.go",
"k8s.io/client-go/pkg/apis/componentconfig/types.go", "k8s.io/client-go/pkg/apis/componentconfig/types.go",
"k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go", "k8s.io/client-go/pkg/apis/componentconfig/zz_generated.deepcopy.go",
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//vendor:github.com/ugorji/go/codec",
"//vendor:k8s.io/client-go/pkg/api/unversioned", "//vendor:k8s.io/client-go/pkg/api/unversioned",
"//vendor:k8s.io/client-go/pkg/conversion", "//vendor:k8s.io/client-go/pkg/conversion",
"//vendor:k8s.io/client-go/pkg/runtime", "//vendor:k8s.io/client-go/pkg/runtime",